X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f55fee08e9d56f3994e0af75efe179d14a6258e7..cc8bc5aa9cd14c158de637acb9e5ed8beb066d57:/include/wx/msw/dialog.h?ds=inline diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 3d8cfa3cc2..13c8c2b59a 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -12,18 +12,15 @@ #ifndef _WX_DIALOG_H_ #define _WX_DIALOG_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "dialog.h" -#endif - #include "wx/panel.h" -extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr; +extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[]; class WXDLLEXPORT wxDialogModalData; #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__)) class WXDLLEXPORT wxToolBar; +extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[]; #endif // Dialog boxes @@ -63,6 +60,8 @@ public: // may be called to terminate the dialog with the given return code virtual void EndModal(int retCode); + + // we treat dialog toolbars specially under Windows CE #if wxUSE_TOOLBAR && defined(__POCKETPC__) // create main toolbar by calling OnCreateToolBar() virtual wxToolBar* CreateToolBar(long style = -1, @@ -75,7 +74,8 @@ public: // get the main toolbar wxToolBar *GetToolBar() const { return m_dialogToolBar; } -#endif +#endif // wxUSE_TOOLBAR && __POCKETPC__ + // implementation only from now on // -------------------------------