Because someone was inconsistent about using LPSTR and char*, I missed

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index e5bd76e8cb73d33125a88833860d8c609dfbccea..74a07e56856b3b0e60cec5e1a9931a8b92c27e6a 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -18,7 +18,7 @@
 
 #include "wx/panel.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxDialogNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
 
 // Dialog boxes
 class WXDLLEXPORT wxDialog : public wxPanel
@@ -60,9 +60,12 @@ public:
 
     ~wxDialog();
 
+    void SetReturnCode(int returnCode) { m_returnCode = returnCode; }
+    int GetReturnCode() const { return m_returnCode; }
+
     virtual bool Destroy();
 
-    virtual void SetClientSize(int width, int height);
+    virtual void DoSetClientSize(int width, int height);
 
     virtual void GetPosition(int *x, int *y) const;
 
@@ -104,9 +107,11 @@ public:
     // Responds to colour changes
     void OnSysColourChanged(wxSysColourChangedEvent& event);
 
-    // IMPLEMENTATION
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
-    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);
 
@@ -122,10 +127,13 @@ 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;
+
     DECLARE_EVENT_TABLE()
 };