Changeset 101

Timestamp:

03/08/07 08:49:00 (6 years ago)

Author:

guyru

Message:

final fix for bug #1700729 under windows

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (2 diffs)
• src/MainFrame.cpp (modified) (2 diffs)

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -10 +10 @@
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="563" Type="Source" />
+   <View0 line="509" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/MainFrame.h" >
-   <View0 line="105" Type="Source" />
+   <View0 Type="Source" />
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/About.h" >
@@ -19 +19 @@
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/openyahtzee/trunk/OpenYahtzee/src/UtilityFunctions.h" >
-   <View0 line="0" Type="Source" />
+   <View0 line="30" Type="Source" />
   </Doc5>
  </DocsAndViews>

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -506 +506 @@
 void MainFrame::OnRollButton (wxCommandEvent& event)
 {
-        if (event.GetEventType() == wxEVT_ENABLE_ROLL) {
+        if (event.GetEventType() == wxEVT_IDLE) {
                 m_skiproll = false;
+                Disconnect(wxEVT_IDLE,  wxCommandEventHandler(MainFrame::OnRollButton));
                 return;
         }
@@ -562 +563 @@
         m_yahtzeebonus = false; //if we scored yahtzee bonus before we don't care anymore.
         
-        //queue the event which will reset m_skiproll
-        event.SetEventType(wxEVT_ENABLE_ROLL);
-        wxEvtHandler::AddPendingEvent(event);
+        Connect(wxEVT_IDLE, wxCommandEventHandler(MainFrame::OnRollButton));
 }