X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a23fd0e1d1329a4a258b4defb3e0b0001b700c6e..c7a800eadb57600c13c3893c623b0e6d653e7abb:/include/wx/msw/dialog.h diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index c4e4a0b6ce..917667ed4f 100644 --- 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); @@ -110,6 +107,8 @@ public: // implementation // -------------- + long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam); @@ -130,8 +129,7 @@ private: WXHWND m_hwndToolTip; #endif // tooltips - int m_returnCode; - +private: DECLARE_EVENT_TABLE() };