Temporarily disable colour picker to keep build working and bofore finding nice repla...

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 91dd0fc5640433cf2b819478a14e9da791343109..2553a5b2bcedf9147e8a149e17cd3d465d687821 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -14,13 +14,13 @@
 
 #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;
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 #endif
 
 // Dialog boxes
@@ -108,9 +108,7 @@ public:
     // Windows callbacks
     WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
-    // obsolete methods
-    // ----------------
-
+#if WXWIN_COMPATIBILITY_2_6
     // use the other ctor
     wxDEPRECATED( wxDialog(wxWindow *parent,
              const wxString& title, bool modal,
@@ -123,6 +121,10 @@ public:
 
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
+#endif // WXWIN_COMPATIBILITY_2_6
+
+    // handle Escape here
+    virtual bool MSWProcessMessage(WXMSG* pMsg);
 
 protected:
     // find the window to use as parent for this dialog if none has been
@@ -142,9 +144,6 @@ protected:
     // return true if button was "clicked" or false if we don't have it
     bool EmulateButtonClickIfPresent(int id);
 
-    // handle Escape here
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
-
 private:
     wxWindow*   m_oldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog