X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc429ce01f519f3edae182b516cb15b8d2df54a7..f9e5b1c786b132485fb0570755d693ff354f4418:/include/wx/aui/framemanager.h?ds=sidebyside

diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h
index 29e3abf18f..f3b8d6b3a7 100644
--- a/include/wx/aui/framemanager.h
+++ b/include/wx/aui/framemanager.h
@@ -39,23 +39,22 @@ enum wxFrameManagerDock
 
 enum wxFrameManagerOption
 {
-    wxAUI_MGR_ALLOW_FLOATING        = 1 << 0,
-    wxAUI_MGR_ALLOW_ACTIVE_PANE     = 1 << 1,
-    wxAUI_MGR_TRANSPARENT_DRAG      = 1 << 2,
-    wxAUI_MGR_TRANSPARENT_HINT      = 1 << 3,
-    wxAUI_MGR_TRANSPARENT_HINT_FADE = 1 << 4,
-    // The venetian blind effect is ONLY used when the wxAUI_MGR_TRANSPARENT_HINT has been used, but
-    // at runtime we determine we cannot use transparency (because, for instance, the OS does not support it).
-    // setting this flag drops back in such circumstances (only) to the behaviour without wxAUI_MGR_TRANSPARENT_HINT
-    wxAUI_MGR_DISABLE_VENETIAN_BLINDS = 1 << 5,
-    wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE = 1 << 6,
+    wxAUI_MGR_ALLOW_FLOATING           = 1 << 0,
+    wxAUI_MGR_ALLOW_ACTIVE_PANE        = 1 << 1,
+    wxAUI_MGR_TRANSPARENT_DRAG         = 1 << 2,
+    wxAUI_MGR_TRANSPARENT_HINT         = 1 << 3,
+    wxAUI_MGR_VENETIAN_BLINDS_HINT     = 1 << 4,
+    wxAUI_MGR_RECTANGLE_HINT           = 1 << 5,
+    wxAUI_MGR_HINT_FADE                = 1 << 6,
+    wxAUI_MGR_NO_VENETIAN_BLINDS_FADE  = 1 << 7,
 
     wxAUI_MGR_DEFAULT = wxAUI_MGR_ALLOW_FLOATING |
                         wxAUI_MGR_TRANSPARENT_HINT |
-                        wxAUI_MGR_TRANSPARENT_HINT_FADE |
-                        wxAUI_MGR_DISABLE_VENETIAN_BLINDS_FADE
+                        wxAUI_MGR_HINT_FADE |
+                        wxAUI_MGR_NO_VENETIAN_BLINDS_FADE
 };
 
+
 enum wxPaneDockArtSetting
 {
     wxAUI_ART_SASH_SIZE = 0,
@@ -383,7 +382,7 @@ public:
 
 
 
-
+class WXDLLIMPEXP_AUI wxFloatingPane;
 
 class WXDLLIMPEXP_AUI wxFrameManager : public wxEvtHandler
 {
@@ -443,11 +442,11 @@ public:
 
 
 public:
-    virtual wxFloatingPane * CreateFloatingFrame(wxWindow* parent, const wxPaneInfo& p);
+    virtual wxFloatingPane* CreateFloatingFrame(wxWindow* parent, const wxPaneInfo& p);
 
     void DrawHintRect(wxWindow* pane_window,
-                       const wxPoint& pt,
-                       const wxPoint& offset);
+                      const wxPoint& pt,
+                      const wxPoint& offset);
     virtual void ShowHint(const wxRect& rect);
     virtual void HideHint();
 
@@ -461,7 +460,7 @@ public:
     
 protected:
 
-
+    void UpdateHintWindowConfig();
     
     void DoFrameLayout();