X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c31d9c7f601e767cc3210b63a989434af76fef61..f6669958924c3c3833e2932b65598b06073d2e65:/include/wx/progdlg.h diff --git a/include/wx/progdlg.h b/include/wx/progdlg.h index 48c708af02..ffde41862b 100644 --- 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