Factorize timercmm.cpp code

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index c6f248b54523bf7965d04fa78776fd81f37c2d26..0e4dce9d62304171aeedeee202425169db95d5aa 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -18,10 +18,10 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 // Dialog boxes
-class WXDLLEXPORT wxDialog : public wxPanel
+class WXDLLEXPORT wxDialog : public wxDialogBase
 {
     DECLARE_DYNAMIC_CLASS(wxDialog)
 
@@ -60,9 +60,6 @@ public:
 
     ~wxDialog();
 
-    void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
-    int GetReturnCode() const { return m_returnCode; }
-
     virtual bool Destroy();
 
     virtual void DoSetClientSize(int width, int height);
@@ -92,8 +89,7 @@ public:
     void SetModal(bool flag);
 
     virtual void Centre(int direction = wxBOTH);
-    virtual bool IsModal() const
-        { return ((GetWindowStyleFlag() & wxDIALOG_MODAL) == wxDIALOG_MODAL); }
+    virtual bool IsModal() const;
 
     // For now, same as Show(TRUE) but returns return code
     virtual int ShowModal();
@@ -107,8 +103,11 @@ public:
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
-    // IMPLEMENTATION
-    virtual bool MSWOnClose();
+    // implementation
+    // --------------
+
+    long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
+
     virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                                 WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
 
@@ -124,12 +123,12 @@ protected:
     bool   m_modalShowing;
     WXHWND m_hwndOldFocus;  // the window which had focus before we were shown
 
+private:
 #if wxUSE_TOOLTIPS
     WXHWND                m_hwndToolTip;
 #endif // tooltips
 
-    int m_returnCode;
-
+private:
     DECLARE_EVENT_TABLE()
 };