Move wxWindowCocoaScrollView class into its own header.

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index dd35d7fd8800f1afc9dff8fb957a6f04f11b743a..4238868df34e7021ab9043f5275df0ec8ee38aff 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -83,9 +83,6 @@ public:
     virtual void Refresh( bool eraseBackground = true,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();
     virtual void Refresh( bool eraseBackground = true,
                           const wxRect *rect = (const wxRect *) NULL );
     virtual void Update();

-    virtual void Freeze();
-    virtual void Thaw();
-    virtual bool IsFrozen() const { return m_frozenness > 0; }

 
     virtual void SetWindowStyleFlag(long style);
     virtual void SetExtraStyle(long exStyle);
 
     virtual void SetWindowStyleFlag(long style);
     virtual void SetExtraStyle(long exStyle);


@@ -503,6 +500,9 @@ protected:
 
     virtual void DoEnable(bool enable);
 
 
     virtual void DoEnable(bool enable);
 

+    virtual void DoFreeze();
+    virtual void DoThaw();
+

     // this simply moves/resizes the given HWND which is supposed to be our
     // sibling (this is useful for controls which are composite at MSW level
     // and for which DoMoveWindow() is not enough)
     // this simply moves/resizes the given HWND which is supposed to be our
     // sibling (this is useful for controls which are composite at MSW level
     // and for which DoMoveWindow() is not enough)


@@ -555,8 +555,6 @@ private:
     bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
 
     bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
 

-    
-

     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;
 


@@ -567,10 +565,6 @@ protected:
     wxPoint     m_pendingPosition;
     wxSize      m_pendingSize;
 
     wxPoint     m_pendingPosition;
     wxSize      m_pendingSize;
 

-    // number of calls to Freeze() minus number of calls to Thaw()
-    // protected so that wxTopLevelWindowMSW can access it
-    unsigned int m_frozenness;
-

 private:
 #ifdef __POCKETPC__
     bool        m_contextMenuEnabled;
 private:
 #ifdef __POCKETPC__
     bool        m_contextMenuEnabled;