X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1169a91932273bc84c23ed9dbd0a2da064d59d66..c26dba42b75b2c19df5834417ffbe330bc375b20:/include/wx/msw/window.h?ds=sidebyside

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index 74f5ec8e5b..87d7ab8084 100644
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -53,14 +53,18 @@ enum
 class WXDLLEXPORT wxWindowMSW : public wxWindowBase
 {
 public:
-    wxWindowMSW();
+    wxWindowMSW() { Init(); }
 
     wxWindowMSW(wxWindow *parent,
                 wxWindowID id,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 long style = 0,
-                const wxString& name = wxPanelNameStr);
+                const wxString& name = wxPanelNameStr)
+    {
+        Init();
+        Create(parent, id, pos, size, style, name);
+    }
 
     virtual ~wxWindowMSW();
 
@@ -343,10 +347,10 @@ public:
     bool HandleSetCursor(WXHWND hWnd, short nHitTest, int mouseMsg);
 
     // Window procedure
-    virtual long MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     // Calls an appropriate default window procedure
-    virtual long MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
+    virtual WXLRESULT MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
 
     // message processing helpers
 
@@ -459,6 +463,9 @@ private:
     // list of disabled children before last call to our Disable()
     wxWindowList *m_childrenDisabled;
 
+    // number of calls to Freeze() minus number of calls to Thaw()
+    unsigned int m_frozenness;
+
     DECLARE_DYNAMIC_CLASS(wxWindowMSW)
     DECLARE_NO_COPY_CLASS(wxWindowMSW)
     DECLARE_EVENT_TABLE()