Applied patch [ 1339882 ] richtext misc cleanup

[wxWidgets.git] / include / wx / msw / dialog.h

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 3d8cfa3cc29c6a51ee24447a114caead856fed66..91dd0fc5640433cf2b819478a14e9da791343109 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -12,10 +12,6 @@
 #ifndef _WX_DIALOG_H_
 #define _WX_DIALOG_H_
 
 #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;
 #include "wx/panel.h"
 
 extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;


@@ -24,6 +20,7 @@ class WXDLLEXPORT wxDialogModalData;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
 class WXDLLEXPORT wxToolBar;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
 class WXDLLEXPORT wxToolBar;

+extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;

 #endif
 
 // Dialog boxes
 #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);
 
     // 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,
 #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; }
 
     // get the main toolbar
     wxToolBar *GetToolBar() const { return m_dialogToolBar; }

-#endif
+#endif // wxUSE_TOOLBAR && __POCKETPC__
+

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------