]> git.saurik.com Git - wxWidgets.git/blobdiff - samples/statbar/statbar.cpp
Remove wxRTTI macro for wxComboBox from Motif port.
[wxWidgets.git] / samples / statbar / statbar.cpp
index 31a26ddfbbcbf921ded1e586ad5c9c19e2346688..7ea8202d8e62b69ec39e5365450cac5711286820 100644 (file)
@@ -50,7 +50,7 @@
 #include "wx/numdlg.h"
 #include "wx/fontdlg.h"
 
 #include "wx/numdlg.h"
 #include "wx/fontdlg.h"
 
-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../sample.xpm"
 #endif
 
     #include "../sample.xpm"
 #endif
 
@@ -947,11 +947,6 @@ void MyStatusBar::OnSize(wxSizeEvent& event)
         return;
 #endif
 
         return;
 #endif
 
-    // TEMPORARY HACK: TODO find a more general solution
-#ifdef wxStatusBarGeneric
-    wxStatusBar::OnSize(event);
-#endif
-
     wxRect rect;
     if (!GetFieldRect(Field_Checkbox, rect))
     {
     wxRect rect;
     if (!GetFieldRect(Field_Checkbox, rect))
     {