added support for wxCAL_SHOW_WEEK_NUMBERS to generic version of wxCalendarCtrl (...

[wxWidgets.git] / interface / wx / aui / framemanager.h

diff --git a/interface/wx/aui/framemanager.h b/interface/wx/aui/framemanager.h
index a48a9443529ec9502f2fc104afe49b4ee1f99083..bdca83fbfd7546f652538007025939cde2c651ec 100644 (file)
--- a/interface/wx/aui/framemanager.h
+++ b/interface/wx/aui/framemanager.h
@@ -70,8 +70,8 @@ enum wxAuiManagerOption
     @code
     wxTextCtrl* text1 = new wxTextCtrl(this, -1);
     wxTextCtrl* text2 = new wxTextCtrl(this, -1);
-    m_mgr.AddPane(text1, wxLEFT, wxT("Pane Caption"));
-    m_mgr.AddPane(text2, wxBOTTOM, wxT("Pane Caption"));
+    m_mgr.AddPane(text1, wxLEFT, "Pane Caption");
+    m_mgr.AddPane(text2, wxBOTTOM, "Pane Caption");
     m_mgr.Update();
     @endcode
 
@@ -203,8 +203,8 @@ public:
         interface. If the lookup failed (meaning the pane could not be found in the
         manager), a call to the returned wxAuiPaneInfo's IsOk() method will return @false.
     */
-    wxAuiPaneInfo GetPane(wxWindow* window);
-    wxAuiPaneInfo GetPane(const wxString& name);
+    wxAuiPaneInfo& GetPane(wxWindow* window);
+    wxAuiPaneInfo& GetPane(const wxString& name);
     //@}
 
     /**
@@ -285,7 +285,7 @@ public:
         This method is used to specify wxAuiManager's settings flags. @a flags
         specifies options which allow the frame management behavior to be modified.
     */
-    void SetFlags(int flags);
+    void SetFlags(unsigned int flags);
 
     /**
         Called to specify the frame or window which is to be managed by wxAuiManager.
@@ -366,8 +366,8 @@ public:
         BestSize() sets the ideal size for the pane. The docking manager will attempt
         to use this size as much as possible when docking or floating the pane.
     */
-    wxAuiPaneInfo BestSize(const wxSize& size);
-    wxAuiPaneInfo BestSize(int x, int y);
+    wxAuiPaneInfo& BestSize(const wxSize& size);
+    wxAuiPaneInfo& BestSize(int x, int y);
     //@}
 
     /**
@@ -400,8 +400,8 @@ public:
         right, bottom) are subtracted from the layout.
         This is the same thing as calling Direction(wxAUI_DOCK_CENTRE).
     */
-    wxAuiPaneInfo Centre();
-    wxAuiPaneInfo Center();
+    wxAuiPaneInfo& Centre();
+    wxAuiPaneInfo& Center();
     //@}
 
     //@{
@@ -411,8 +411,8 @@ public:
         This function provides an easy way of preparing a pane to be displayed in
         the center dock position.
     */
-    wxAuiPaneInfo CentrePane();
-    wxAuiPaneInfo CenterPane();
+    wxAuiPaneInfo& CentrePane();
+    wxAuiPaneInfo& CenterPane();
     //@}
 
     /**
@@ -479,16 +479,16 @@ public:
     /**
         FloatingPosition() sets the position of the floating pane.
     */
-    wxAuiPaneInfo FloatingPosition(const wxPoint& pos);
-    wxAuiPaneInfo FloatingPosition(int x, int y);
+    wxAuiPaneInfo& FloatingPosition(const wxPoint& pos);
+    wxAuiPaneInfo& FloatingPosition(int x, int y);
     //@}
 
     //@{
     /**
         FloatingSize() sets the size of the floating pane.
     */
-    wxAuiPaneInfo FloatingSize(const wxSize& size);
-    wxAuiPaneInfo FloatingSize(int x, int y);
+    wxAuiPaneInfo& FloatingSize(const wxSize& size);
+    wxAuiPaneInfo& FloatingSize(int x, int y);
     //@}
 
     /**
@@ -649,8 +649,8 @@ public:
     /**
         MaxSize() sets the maximum size of the pane.
     */
-    wxAuiPaneInfo MaxSize(const wxSize& size);
-    wxAuiPaneInfo MaxSize(int x, int y);
+    wxAuiPaneInfo& MaxSize(const wxSize& size);
+    wxAuiPaneInfo& MaxSize(int x, int y);
     //@}
 
     /**
@@ -663,8 +663,8 @@ public:
         MinSize() sets the minimum size of the pane. Please note that this is only
         partially supported as of this writing.
     */
-    wxAuiPaneInfo MinSize(const wxSize& size);
-    wxAuiPaneInfo MinSize(int x, int y);
+    wxAuiPaneInfo& MinSize(const wxSize& size);
+    wxAuiPaneInfo& MinSize(int x, int y);
     //@}
 
     /**
@@ -731,7 +731,7 @@ public:
         SetFlag() turns the property given by flag on or off with the option_state
         parameter.
     */
-    wxAuiPaneInfo& SetFlag(unsigned int flag, bool option_state);
+    wxAuiPaneInfo& SetFlag(int flag, bool option_state);
 
     /**
         Show() indicates that a pane should be shown.