X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7a5b04a65e5988ffdd95f36bafb32644acbf4179..3882e74621cd5833fddb432fe014bea66c16ee28:/include/wx/aui/framemanager.h?ds=sidebyside diff --git a/include/wx/aui/framemanager.h b/include/wx/aui/framemanager.h index 904f07415b..cf6d9094c7 100644 --- a/include/wx/aui/framemanager.h +++ b/include/wx/aui/framemanager.h @@ -39,21 +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_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_HINT_FADE | + wxAUI_MGR_NO_VENETIAN_BLINDS_FADE }; + enum wxPaneDockArtSetting { wxAUI_ART_SASH_SIZE = 0, @@ -84,9 +85,27 @@ enum wxPaneDockArtGradients enum wxPaneButtonState { - wxAUI_BUTTON_STATE_NORMAL = 0, - wxAUI_BUTTON_STATE_HOVER = 1, - wxAUI_BUTTON_STATE_PRESSED = 2 + wxAUI_BUTTON_STATE_NORMAL = 0, + wxAUI_BUTTON_STATE_HOVER = 1 << 1, + wxAUI_BUTTON_STATE_PRESSED = 1 << 2, + wxAUI_BUTTON_STATE_DISABLED = 1 << 3, + wxAUI_BUTTON_STATE_HIDDEN = 1 << 4 +}; + +enum wxAuiButtonId +{ + wxAUI_BUTTON_CLOSE = 101, + wxAUI_BUTTON_MAXIMIZE = 102, + wxAUI_BUTTON_MINIMIZE = 103, + wxAUI_BUTTON_PIN = 104, + wxAUI_BUTTON_OPTIONS = 105, + wxAUI_BUTTON_LEFT = 106, + wxAUI_BUTTON_RIGHT = 107, + wxAUI_BUTTON_UP = 108, + wxAUI_BUTTON_DOWN = 109, + wxAUI_BUTTON_CUSTOM1 = 201, + wxAUI_BUTTON_CUSTOM2 = 202, + wxAUI_BUTTON_CUSTOM3 = 203 }; enum wxPaneInsertLevel @@ -98,6 +117,7 @@ enum wxPaneInsertLevel + // forwards and array declarations class wxDockUIPart; class wxPaneButton; @@ -111,8 +131,8 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDockInfo, wxDockInfoArray, WXDLLIMPEXP_AUI); WX_DECLARE_USER_EXPORTED_OBJARRAY(wxDockUIPart, wxDockUIPartArray, WXDLLIMPEXP_AUI); WX_DECLARE_USER_EXPORTED_OBJARRAY(wxPaneButton, wxPaneButtonArray, WXDLLIMPEXP_AUI); WX_DECLARE_USER_EXPORTED_OBJARRAY(wxPaneInfo, wxPaneInfoArray, WXDLLIMPEXP_AUI); -WX_DEFINE_ARRAY_PTR(wxPaneInfo*, wxPaneInfoPtrArray); -WX_DEFINE_ARRAY_PTR(wxDockInfo*, wxDockInfoPtrArray); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxPaneInfo*, wxPaneInfoPtrArray, class WXDLLIMPEXP_AUI); +WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxDockInfo*, wxDockInfoPtrArray, class WXDLLIMPEXP_AUI); #endif // SWIG extern WXDLLIMPEXP_AUI wxDockInfo wxNullDockInfo; @@ -189,7 +209,20 @@ public: return *this; } #endif // SWIG - + + // Write the safe parts of a newly loaded PaneInfo structure "source" into "this" + // used on loading perspectives etc. + void SafeSet(wxPaneInfo source) + { + // note source is not passed by reference so we can overwrite, to keep the + // unsafe bits of "dest" + source.window = window; + source.frame = frame; + source.buttons = buttons; + // now assign + *this = source; + } + bool IsOk() const { return (window != NULL) ? true : false; } bool IsFixed() const { return !HasFlag(optionResizable); } bool IsResizable() const { return HasFlag(optionResizable); } @@ -203,6 +236,7 @@ public: bool IsRightDockable() const { return HasFlag(optionRightDockable); } bool IsFloatable() const { return HasFlag(optionFloatable); } bool IsMovable() const { return HasFlag(optionMovable); } + bool IsDestroyOnClose() const { return HasFlag(optionDestroyOnClose); } bool HasCaption() const { return HasFlag(optionCaption); } bool HasGripper() const { return HasFlag(optionGripper); } bool HasBorder() const { return HasFlag(optionPaneBorder); } @@ -367,7 +401,7 @@ public: - +class WXDLLIMPEXP_AUI wxFloatingPane; class WXDLLIMPEXP_AUI wxFrameManager : public wxEvtHandler { @@ -412,6 +446,11 @@ public: int insert_level = wxAUI_INSERT_PANE); bool DetachPane(wxWindow* window); + + void ClosePane(wxPaneInfo& pane_info); + + wxString SavePaneInfo(wxPaneInfo& pane); + void LoadPaneInfo(wxString pane_part, wxPaneInfo &pane); wxString SavePerspective(); @@ -422,10 +461,11 @@ public: public: + 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(); @@ -439,7 +479,7 @@ public: protected: - + void UpdateHintWindowConfig(); void DoFrameLayout(); @@ -474,8 +514,8 @@ protected: wxDockUIPart* GetPanePart(wxWindow* pane); int GetDockPixelOffset(wxPaneInfo& test); void OnFloatingPaneMoveStart(wxWindow* window); - void OnFloatingPaneMoving(wxWindow* window); - void OnFloatingPaneMoved(wxWindow* window); + void OnFloatingPaneMoving(wxWindow* window, wxDirection dir ); + void OnFloatingPaneMoved(wxWindow* window, wxDirection dir); void OnFloatingPaneActivated(wxWindow* window); void OnFloatingPaneClosed(wxWindow* window, wxCloseEvent& evt); void OnFloatingPaneResized(wxWindow* window, const wxSize& size); @@ -537,6 +577,8 @@ protected: wxDockUIPart* m_action_part; // ptr to the part the action happened to wxWindow* m_action_window; // action frame or window (NULL if none) wxRect m_action_hintrect; // hint rectangle for the action + bool m_skipping; + wxRect m_last_rect; wxDockUIPart* m_hover_button;// button uipart being hovered over wxRect m_last_hint; // last hint rectangle wxPoint m_last_mouse_move; // last mouse move position (see OnMotion)