Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/aui/framemanager.h b/interface/wx/aui/framemanager.h
index f67783ab48990ceb7dc2cc9f3d41a54423f2416e..25a0c73ddbeb4555b736c4f9ccf917f4593e9bfe 100644 (file)
--- a/interface/wx/aui/framemanager.h
+++ b/interface/wx/aui/framemanager.h
@@ -23,7 +23,7 @@ enum wxAuiManagerDock
 
 
 /**
-    @todo wxAuiManager behavior style flags.
+    @todo wxAuiManager behaviour style flags.
 */
 enum wxAuiManagerOption
 {
@@ -50,7 +50,7 @@ enum wxAuiManagerOption
 
     wxAuiManager manages the panes associated with it for a particular wxFrame,
     using a pane's wxAuiPaneInfo information to determine each pane's docking
-    and floating behavior.
+    and floating behaviour.
 
     wxAuiManager uses wxWidgets' sizer mechanism to plan the layout of each
     frame. It uses a replaceable dock art class to do all drawing, so all
@@ -135,7 +135,7 @@ class wxAuiManager : public wxEvtHandler
 public:
     /**
         Constructor. @a managed_wnd specifies the wxFrame which should be managed.
-        @a flags  specifies options which allow the frame management behavior
+        @a flags  specifies options which allow the frame management behaviour
         to be modified.
     */
     wxAuiManager(wxWindow* managed_wnd = NULL,
@@ -299,7 +299,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.
+        specifies options which allow the frame management behaviour to be modified.
     */
     void SetFlags(unsigned int flags);