compilation fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index a327e06d6e82493795bc05ea5bc47397d130ddf3..4f64c38725bc7374adb6c8e9c8fe96bf1ef3581b 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -419,7 +419,7 @@ public:
 
     void CopyObject(wxObject& obj) const;
 
-#ifdef WXWIN_COMPATIBILITY_2
+#if WXWIN_COMPATIBILITY_2
     bool Checked() const { return IsChecked(); }
 #endif // WXWIN_COMPATIBILITY_2
 

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index ccb8237a04e672623bfdc2e28516087e92830f67..65ac5783e4a3580f6e1b48c36df5b9d1e7cfe0fa 100644 (file)
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -23,7 +23,8 @@
 #define XIconifyWindow XICONIFYWINDOW
 #endif
 
-#include "wx/frame.h"
+#include "wx/defs.h"
+
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
@@ -1248,15 +1249,5 @@ void wxFrameGTK::SetIconizeState(bool iconize)
         m_isIconized = iconize;
         (void)SendIconizeEvent(iconize);
     }
-    else
-    {
-        // this is not supposed to happen if we're called only from
-        // gtk_frame_(un)map_callback!
-        
-        // RR: I don't understand this test. Upon startup, the frame is
-        //     not iconized by default, it has just not been created
-        //     yet.
-        ///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
-    }
 }
 

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index ccb8237a04e672623bfdc2e28516087e92830f67..65ac5783e4a3580f6e1b48c36df5b9d1e7cfe0fa 100644 (file)
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -23,7 +23,8 @@
 #define XIconifyWindow XICONIFYWINDOW
 #endif
 
-#include "wx/frame.h"
+#include "wx/defs.h"
+
 #include "wx/dialog.h"
 #include "wx/control.h"
 #include "wx/app.h"
@@ -1248,15 +1249,5 @@ void wxFrameGTK::SetIconizeState(bool iconize)
         m_isIconized = iconize;
         (void)SendIconizeEvent(iconize);
     }
-    else
-    {
-        // this is not supposed to happen if we're called only from
-        // gtk_frame_(un)map_callback!
-        
-        // RR: I don't understand this test. Upon startup, the frame is
-        //     not iconized by default, it has just not been created
-        //     yet.
-        ///wxFAIL_MSG( _T("unexpected call to SendIconizeEvent ignored") );
-    }
 }