part of wxComboBox to wxEntry refactoring (should have been part of rev48952)

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 6d26a72c9ff9bcf053a4808199d8470ad78586a9..3f128f412060df66493a5d8bc906874589db6600 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -16,10 +16,10 @@
 
 extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];
 
-class WXDLLEXPORT wxDialogModalData;
+class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
-class WXDLLEXPORT wxToolBar;
+class WXDLLIMPEXP_FWD_CORE wxToolBar;
 extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];
 #endif
 
@@ -85,18 +85,6 @@ public:
 
     virtual void Raise();
 
-    // event handlers
-    void OnCharHook(wxKeyEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-
-    // Standard buttons
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
 #ifdef __POCKETPC__
     // Responds to the OK button in a PocketPC titlebar. This
     // can be overridden, or you can change the id used for
@@ -108,9 +96,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,9 +109,7 @@ public:
 
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
-
-    // handle Escape here
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
+#endif // WXWIN_COMPATIBILITY_2_6
 
 protected:
     // find the window to use as parent for this dialog if none has been
@@ -137,14 +121,6 @@ protected:
     // common part of all ctors
     void Init();
 
-    // end either modal or modeless dialog
-    void EndDialog(int rc);
-
-    // emulate click of a button with the given id if it's present in the dialog
-    //
-    // return true if button was "clicked" or false if we don't have it
-    bool EmulateButtonClickIfPresent(int id);
-
 private:
     wxWindow*   m_oldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog
@@ -157,7 +133,6 @@ private:
     wxDialogModalData *m_modalData;
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxDialog)
 };