added wxWeakRef<T> (slightly modified patch 1860953)

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

diff --git a/include/wx/msw/window.h b/include/wx/msw/window.h
index c88d22e299f540efcfa8f22b78e94ff6270397bb..4238868df34e7021ab9043f5275df0ec8ee38aff 100644 (file)
--- a/include/wx/msw/window.h
+++ b/include/wx/msw/window.h
@@ -59,7 +59,19 @@ public:
     virtual void Raise();
     virtual void Lower();
 
-    virtual bool Show( bool show = true );
+    virtual bool Show(bool show = true);
+    virtual bool ShowWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0,
+                                wxDirection dir = wxBOTTOM)
+    {
+        return MSWShowWithEffect(true, effect, timeout, dir);
+    }
+    virtual bool HideWithEffect(wxShowEffect effect,
+                                unsigned timeout = 0,
+                                wxDirection dir = wxBOTTOM)
+    {
+        return MSWShowWithEffect(false, effect, timeout, dir);
+    }
 
     virtual void SetFocus();
     virtual void SetFocusFromKbd();
@@ -71,9 +83,6 @@ public:
     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);
@@ -419,6 +428,11 @@ public:
         return true;
     }
 
+    // common part of Show/HideWithEffect()
+    bool MSWShowWithEffect(bool show,
+                           wxShowEffect effect,
+                           unsigned timeout,
+                           wxDirection dir);
 
     // Responds to colour changes: passes event on to children.
     void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -448,6 +462,10 @@ protected:
     // choose the default border for this window
     virtual wxBorder GetDefaultBorder() const;
 
+    // Translate wxBORDER_THEME (and other border styles if necessary to the value
+    // that makes most sense for this Windows environment
+    virtual wxBorder TranslateBorder(wxBorder border) const;
+
 #if wxUSE_MENUS_NATIVE
     virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
 #endif // wxUSE_MENUS_NATIVE
@@ -482,6 +500,9 @@ protected:
 
     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)
@@ -534,9 +555,6 @@ private:
     bool HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
 
-    // number of calls to Freeze() minus number of calls to Thaw()
-    unsigned int m_frozenness;
-
     // current defer window position operation handle (may be NULL)
     WXHANDLE m_hDWP;