fix wxBitmapComboBox Gtk-CRITICAL assertion `GTK_IS_ENTRY (entry)' failed

[wxWidgets.git] / include / wx / progdlg.h

diff --git a/include/wx/progdlg.h b/include/wx/progdlg.h
index 48c708af02c850fbadeec4f8011a5ccb52665c58..ffde41862b6df14c35a4ff2b7420570549a68c9e 100644 (file)
--- a/include/wx/progdlg.h
+++ b/include/wx/progdlg.h
@@ -29,31 +29,27 @@
 #define wxPD_CAN_SKIP           0x0080
 
 
-#ifdef __WXPALMOS__
-    #include "wx/palmos/progdlg.h"
+#include "wx/generic/progdlgg.h"
+
+#if defined(__WXMSW__) && wxUSE_THREADS && !defined(__WXUNIVERSAL__)
+    #include "wx/msw/progdlg.h"
 #else
-    #include "wx/generic/progdlgg.h"
-
-    #if defined(__WXMSW__) && wxUSE_THREADS
-        #include "wx/msw/progdlg.h"
-    #else
-        class WXDLLIMPEXP_CORE wxProgressDialog
-                               : public wxGenericProgressDialog
-        {
-        public:
-            wxProgressDialog( const wxString& title, const wxString& message,
-                              int maximum = 100,
-                              wxWindow *parent = NULL,
-                              int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE )
-                : wxGenericProgressDialog( title, message, maximum,
-                                           parent, style )
-                { }
-
-        private:
-            wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxProgressDialog );
-        };
-    #endif // defined(__WXMSW__) && wxUSE_THREADS
-#endif // __WXPALMOS__
+    class WXDLLIMPEXP_CORE wxProgressDialog
+                           : public wxGenericProgressDialog
+    {
+    public:
+        wxProgressDialog( const wxString& title, const wxString& message,
+                          int maximum = 100,
+                          wxWindow *parent = NULL,
+                          int style = wxPD_APP_MODAL | wxPD_AUTO_HIDE )
+            : wxGenericProgressDialog( title, message, maximum,
+                                       parent, style )
+            { }
+
+    private:
+        wxDECLARE_DYNAMIC_CLASS_NO_COPY( wxProgressDialog );
+    };
+#endif // defined(__WXMSW__) && wxUSE_THREADS
 
 #endif // wxUSE_PROGRESSDLG