X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a33ac8fb0f5e43c89bd698618d554c6f7b8b452..ff79234425d7521719ca857b85f14d67701f30fc:/include/wx/msw/dialog.h diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h index 2a0631bb54..56135edeb1 100644 --- a/include/wx/msw/dialog.h +++ b/include/wx/msw/dialog.h @@ -35,6 +35,8 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr) { + Init(); + long modalStyle = modal ? wxDIALOG_MODAL : wxDIALOG_MODELESS ; Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), style | modalStyle, name); @@ -48,7 +50,9 @@ public: long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = wxDialogNameStr) { - Create(parent, id, title, pos, size, style, name); + Init(); + + (void)Create(parent, id, title, pos, size, style, name); } bool Create(wxWindow *parent, wxWindowID id, @@ -93,7 +97,7 @@ public: void OnSysColourChanged(wxSysColourChangedEvent& event); // Windows callbacks - long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); + WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); #if wxUSE_CTL3D virtual WXHBRUSH OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,