Document wxKill(wxSIGTERM) reliance on having an open window in wxMSW.

[wxWidgets.git] / include / wx / aui / auibar.h

diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 1e30b0ad4007663d31a165c96b2c4c3e928181d4..066ff62f456616dcccb46fd27769f26f036638f4 100644 (file)
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -4,7 +4,7 @@
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2008-08-04
 // Author:      Benjamin I. Williams
 // Modified by:
 // Created:     2008-08-04

-// RCS-ID:      $Id: framemanager.h 53135 2008-04-12 02:31:04Z VZ $
+// RCS-ID:      $Id$

 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (C) Copyright 2005, Kirix Corporation, All Rights Reserved.
 // Licence:     wxWindows Library Licence, Version 3.1
 ///////////////////////////////////////////////////////////////////////////////


@@ -17,6 +17,11 @@
 #if wxUSE_AUI
 
 #include "wx/control.h"
 #if wxUSE_AUI
 
 #include "wx/control.h"

+#include "wx/sizer.h"
+#include "wx/pen.h"
+
+class WXDLLIMPEXP_FWD_CORE wxClientDC;
+class WXDLLIMPEXP_FWD_AUI wxAuiPaneInfo;

 
 enum wxAuiToolBarStyle
 {
 
 enum wxAuiToolBarStyle
 {


@@ -25,9 +30,18 @@ enum wxAuiToolBarStyle
     wxAUI_TB_NO_AUTORESIZE = 1 << 2,
     wxAUI_TB_GRIPPER       = 1 << 3,
     wxAUI_TB_OVERFLOW      = 1 << 4,
     wxAUI_TB_NO_AUTORESIZE = 1 << 2,
     wxAUI_TB_GRIPPER       = 1 << 3,
     wxAUI_TB_OVERFLOW      = 1 << 4,

+    // using this style forces the toolbar to be vertical and
+    // be only dockable to the left or right sides of the window
+    // whereas by default it can be horizontal or vertical and
+    // be docked anywhere

     wxAUI_TB_VERTICAL      = 1 << 5,
     wxAUI_TB_HORZ_LAYOUT   = 1 << 6,
     wxAUI_TB_VERTICAL      = 1 << 5,
     wxAUI_TB_HORZ_LAYOUT   = 1 << 6,

+    // analogous to wxAUI_TB_VERTICAL, but forces the toolbar
+    // to be horizontal
+    wxAUI_TB_HORIZONTAL    = 1 << 7,
+    wxAUI_TB_PLAIN_BACKGROUND = 1 << 8,

     wxAUI_TB_HORZ_TEXT     = (wxAUI_TB_HORZ_LAYOUT | wxAUI_TB_TEXT),
     wxAUI_TB_HORZ_TEXT     = (wxAUI_TB_HORZ_LAYOUT | wxAUI_TB_TEXT),

+    wxAUI_ORIENTATION_MASK = (wxAUI_TB_VERTICAL | wxAUI_TB_HORIZONTAL),

     wxAUI_TB_DEFAULT_STYLE = 0
 };
 
     wxAUI_TB_DEFAULT_STYLE = 0
 };
 


@@ -52,71 +66,70 @@ enum wxAuiToolBarToolTextOrientation
 class WXDLLIMPEXP_AUI wxAuiToolBarEvent : public wxNotifyEvent
 {
 public:
 class WXDLLIMPEXP_AUI wxAuiToolBarEvent : public wxNotifyEvent
 {
 public:

-    wxAuiToolBarEvent(wxEventType command_type = wxEVT_NULL,
-                      int win_id = 0)
-          : wxNotifyEvent(command_type, win_id)
+    wxAuiToolBarEvent(wxEventType commandType = wxEVT_NULL,
+                      int winId = 0)
+          : wxNotifyEvent(commandType, winId)

     {
     {

-        is_dropdown_clicked = false;
-        click_pt = wxPoint(-1, -1);
-        rect = wxRect(-1,-1, 0, 0);
-        tool_id = -1;
+        m_isDropdownClicked = false;
+        m_clickPt = wxPoint(-1, -1);
+        m_rect = wxRect(-1,-1, 0, 0);
+        m_toolId = -1;

     }
 #ifndef SWIG
     wxAuiToolBarEvent(const wxAuiToolBarEvent& c) : wxNotifyEvent(c)
     {
     }
 #ifndef SWIG
     wxAuiToolBarEvent(const wxAuiToolBarEvent& c) : wxNotifyEvent(c)
     {

-        is_dropdown_clicked = c.is_dropdown_clicked;
-        click_pt = c.click_pt;
-        rect = c.rect;
-        tool_id = c.tool_id;
+        m_isDropdownClicked = c.m_isDropdownClicked;
+        m_clickPt = c.m_clickPt;
+        m_rect = c.m_rect;
+        m_toolId = c.m_toolId;

     }
 #endif
     wxEvent *Clone() const { return new wxAuiToolBarEvent(*this); }
 
     }
 #endif
     wxEvent *Clone() const { return new wxAuiToolBarEvent(*this); }
 

-    bool IsDropDownClicked() const  { return is_dropdown_clicked; }
-    void SetDropDownClicked(bool c) { is_dropdown_clicked = c;    }
+    bool IsDropDownClicked() const  { return m_isDropdownClicked; }
+    void SetDropDownClicked(bool c) { m_isDropdownClicked = c;    }

 
 

-    wxPoint GetClickPoint() const        { return click_pt; }
-    void SetClickPoint(const wxPoint& p) { click_pt = p;    }
+    wxPoint GetClickPoint() const        { return m_clickPt; }
+    void SetClickPoint(const wxPoint& p) { m_clickPt = p;    }

 
 

-    wxRect GetItemRect() const        { return rect; }
-    void SetItemRect(const wxRect& r) { rect = r;    }
+    wxRect GetItemRect() const        { return m_rect; }
+    void SetItemRect(const wxRect& r) { m_rect = r;    }

 
 

-    int GetToolId() const  { return tool_id; }
-    void SetToolId(int id) { tool_id = id;   }
+    int GetToolId() const  { return m_toolId; }
+    void SetToolId(int toolId) { m_toolId = toolId; }

 
 private:
 
 
 private:
 

-    bool is_dropdown_clicked;
-    wxPoint click_pt;
-    wxRect rect;
-    int tool_id;
+    bool m_isDropdownClicked;
+    wxPoint m_clickPt;
+    wxRect m_rect;
+    int m_toolId;

 
 

-#ifndef SWIG

 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent)
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent)

-#endif

 };
 
 
 class WXDLLIMPEXP_AUI wxAuiToolBarItem
 {
     friend class wxAuiToolBar;
 };
 
 
 class WXDLLIMPEXP_AUI wxAuiToolBarItem
 {
     friend class wxAuiToolBar;

-    
+

 public:
 
     wxAuiToolBarItem()
     {
 public:
 
     wxAuiToolBarItem()
     {

-        window = NULL;
-        sizer_item = NULL;
-        spacer_pixels = 0;
-        id = 0;
-        kind = wxITEM_NORMAL;
-        state = 0;  // normal, enabled
-        proportion = 0;
-        active = true;
-        dropdown = true;
-        sticky = true;
-        user_data = 0;
+        m_window = NULL;
+        m_sizerItem = NULL;
+        m_spacerPixels = 0;
+        m_toolId = 0;
+        m_kind = wxITEM_NORMAL;
+        m_state = 0;  // normal, enabled
+        m_proportion = 0;
+        m_active = true;
+        m_dropDown = true;
+        m_sticky = true;
+        m_userData = 0;
+        m_alignment = wxALIGN_CENTER;

     }
 
     wxAuiToolBarItem(const wxAuiToolBarItem& c)
     }
 
     wxAuiToolBarItem(const wxAuiToolBarItem& c)


@@ -132,101 +145,113 @@ public:
 
     void Assign(const wxAuiToolBarItem& c)
     {
 
     void Assign(const wxAuiToolBarItem& c)
     {

-        window = c.window;
-        label = c.label;
-        bitmap = c.bitmap;
-        disabled_bitmap = c.disabled_bitmap;
-        hover_bitmap = c.hover_bitmap;
-        short_help = c.short_help;
-        long_help = c.long_help;
-        sizer_item = c.sizer_item;
-        min_size = c.min_size;
-        spacer_pixels = c.spacer_pixels;
-        id = c.id;
-        kind = c.kind;
-        state = c.state;
-        proportion = c.proportion;
-        active = c.active;
-        dropdown = c.dropdown;
-        sticky = c.sticky;
-        user_data = c.user_data;
+        m_window = c.m_window;
+        m_label = c.m_label;
+        m_bitmap = c.m_bitmap;
+        m_disabledBitmap = c.m_disabledBitmap;
+        m_hoverBitmap = c.m_hoverBitmap;
+        m_shortHelp = c.m_shortHelp;
+        m_longHelp = c.m_longHelp;
+        m_sizerItem = c.m_sizerItem;
+        m_minSize = c.m_minSize;
+        m_spacerPixels = c.m_spacerPixels;
+        m_toolId = c.m_toolId;
+        m_kind = c.m_kind;
+        m_state = c.m_state;
+        m_proportion = c.m_proportion;
+        m_active = c.m_active;
+        m_dropDown = c.m_dropDown;
+        m_sticky = c.m_sticky;
+        m_userData = c.m_userData;
+        m_alignment = c.m_alignment;
+    }
+
+
+    void SetWindow(wxWindow* w) { m_window = w; }
+    wxWindow* GetWindow() { return m_window; }
+
+    void SetId(int newId) { m_toolId = newId; }
+    int GetId() const { return m_toolId; }
+
+    void SetKind(int newKind) { m_kind = newKind; }
+    int GetKind() const { return m_kind; }
+
+    void SetState(int newState) { m_state = newState; }
+    int GetState() const { return m_state; }
+
+    void SetSizerItem(wxSizerItem* s) { m_sizerItem = s; }
+    wxSizerItem* GetSizerItem() const { return m_sizerItem; }
+
+    void SetLabel(const wxString& s) { m_label = s; }
+    const wxString& GetLabel() const { return m_label; }
+
+    void SetBitmap(const wxBitmap& bmp) { m_bitmap = bmp; }
+    const wxBitmap& GetBitmap() const { return m_bitmap; }
+
+    void SetDisabledBitmap(const wxBitmap& bmp) { m_disabledBitmap = bmp; }
+    const wxBitmap& GetDisabledBitmap() const { return m_disabledBitmap; }
+
+    void SetHoverBitmap(const wxBitmap& bmp) { m_hoverBitmap = bmp; }
+    const wxBitmap& GetHoverBitmap() const { return m_hoverBitmap; }
+
+    void SetShortHelp(const wxString& s) { m_shortHelp = s; }
+    const wxString& GetShortHelp() const { return m_shortHelp; }
+
+    void SetLongHelp(const wxString& s) { m_longHelp = s; }
+    const wxString& GetLongHelp() const { return m_longHelp; }
+
+    void SetMinSize(const wxSize& s) { m_minSize = s; }
+    const wxSize& GetMinSize() const { return m_minSize; }
+
+    void SetSpacerPixels(int s) { m_spacerPixels = s; }
+    int GetSpacerPixels() const { return m_spacerPixels; }
+
+    void SetProportion(int p) { m_proportion = p; }
+    int GetProportion() const { return m_proportion; }
+
+    void SetActive(bool b) { m_active = b; }
+    bool IsActive() const { return m_active; }
+
+    void SetHasDropDown(bool b)
+    {
+        wxCHECK_RET( !b || m_kind == wxITEM_NORMAL,
+                     wxS("Only normal tools can have drop downs") );
+
+        m_dropDown = b;

     }
     }

-    
-    
-    void SetWindow(wxWindow* w) { window = w; }
-    wxWindow* GetWindow() { return window; }
-    
-    void SetId(int new_id) { id = new_id; }
-    int GetId() const { return id; }
-    
-    void SetKind(int new_kind) { kind = new_kind; }
-    int GetKind() const { return kind; }
-    
-    void SetState(int new_state) { state = new_state; }
-    int GetState() const { return state; }
-    
-    void SetSizerItem(wxSizerItem* s) { sizer_item = s; }
-    wxSizerItem* GetSizerItem() const { return sizer_item; }
-    
-    void SetLabel(const wxString& s) { label = s; }
-    const wxString& GetLabel() const { return label; }
-    
-    void SetBitmap(const wxBitmap& bmp) { bitmap = bmp; }
-    const wxBitmap& GetBitmap() const { return bitmap; }
-    
-    void SetDisabledBitmap(const wxBitmap& bmp) { disabled_bitmap = bmp; }
-    const wxBitmap& GetDisabledBitmap() const { return disabled_bitmap; }
-    
-    void SetHoverBitmap(const wxBitmap& bmp) { hover_bitmap = bmp; }
-    const wxBitmap& GetHoverBitmap() const { return hover_bitmap; }
-    
-    void SetShortHelp(const wxString& s) { short_help = s; }
-    const wxString& GetShortHelp() const { return short_help; }
-    
-    void SetLongHelp(const wxString& s) { long_help = s; }
-    const wxString& GetLongHelp() const { return long_help; }
-    
-    void SetMinSize(const wxSize& s) { min_size = s; }
-    const wxSize& GetMinSize() const { return min_size; }
-    
-    void SetSpacerPixels(int s) { spacer_pixels = s; }
-    int GetSpacerPixels() const { return spacer_pixels; }
-    
-    void SetProportion(int p) { proportion = p; }
-    int GetProportion() const { return proportion; }
-    
-    void SetActive(bool b) { active = b; }
-    bool IsActive() const { return active; }
-    
-    void SetHasDropDown(bool b) { dropdown = b; }
-    bool HasDropDown() const { return dropdown; }
-    
-    void SetSticky(bool b) { sticky = b; }
-    bool IsSticky() const { return sticky; }
-    
-    void SetUserData(long l) { user_data = l; }
-    long GetUserData() const { return user_data; }
+
+    bool HasDropDown() const { return m_dropDown; }
+
+    void SetSticky(bool b) { m_sticky = b; }
+    bool IsSticky() const { return m_sticky; }
+
+    void SetUserData(long l) { m_userData = l; }
+    long GetUserData() const { return m_userData; }
+
+    void SetAlignment(int l) { m_alignment = l; }
+    int GetAlignment() const { return m_alignment; }

 
 private:
 
 
 private:
 

-    wxWindow* window;          // item's associated window
-    wxString label;            // label displayed on the item
-    wxBitmap bitmap;           // item's bitmap
-    wxBitmap disabled_bitmap;  // item's disabled bitmap
-    wxBitmap hover_bitmap;     // item's hover bitmap
-    wxString short_help;       // short help (for tooltip)
-    wxString long_help;        // long help (for status bar)
-    wxSizerItem* sizer_item;   // sizer item
-    wxSize min_size;           // item's minimum size
-    int spacer_pixels;         // size of a spacer
-    int id;                    // item's id
-    int kind;                  // item's kind
-    int state;                 // state
-    int proportion;            // proportion
-    bool active;               // true if the item is currently active
-    bool dropdown;             // true if the item has a dropdown button
-    bool sticky;               // overrides button states if true (always active)
-    long user_data;            // user-specified data
+    wxWindow* m_window;          // item's associated window
+    wxString m_label;            // label displayed on the item
+    wxBitmap m_bitmap;           // item's bitmap
+    wxBitmap m_disabledBitmap;  // item's disabled bitmap
+    wxBitmap m_hoverBitmap;     // item's hover bitmap
+    wxString m_shortHelp;       // short help (for tooltip)
+    wxString m_longHelp;        // long help (for status bar)
+    wxSizerItem* m_sizerItem;   // sizer item
+    wxSize m_minSize;           // item's minimum size
+    int m_spacerPixels;         // size of a spacer
+    int m_toolId;                // item's id
+    int m_kind;                  // item's kind
+    int m_state;                 // state
+    int m_proportion;            // proportion
+    bool m_active;               // true if the item is currently active
+    bool m_dropDown;             // true if the item has a dropdown button
+    bool m_sticky;               // overrides button states if true (always active)
+    long m_userData;            // user-specified data
+    int m_alignment;             // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other

 };
 
 #ifndef SWIG
 };
 
 #ifndef SWIG


@@ -247,14 +272,22 @@ public:
 
     virtual wxAuiToolBarArt* Clone() = 0;
     virtual void SetFlags(unsigned int flags) = 0;
 
     virtual wxAuiToolBarArt* Clone() = 0;
     virtual void SetFlags(unsigned int flags) = 0;

+    virtual unsigned int GetFlags() = 0;

     virtual void SetFont(const wxFont& font) = 0;
     virtual void SetFont(const wxFont& font) = 0;

+    virtual wxFont GetFont() = 0;

     virtual void SetTextOrientation(int orientation) = 0;
     virtual void SetTextOrientation(int orientation) = 0;

+    virtual int GetTextOrientation() = 0;

 
     virtual void DrawBackground(
                          wxDC& dc,
                          wxWindow* wnd,
                          const wxRect& rect) = 0;
 
 
     virtual void DrawBackground(
                          wxDC& dc,
                          wxWindow* wnd,
                          const wxRect& rect) = 0;
 

+    virtual void DrawPlainBackground(
+                                  wxDC& dc,
+                                  wxWindow* wnd,
+                                  const wxRect& rect) = 0;
+

     virtual void DrawLabel(
                          wxDC& dc,
                          wxWindow* wnd,
     virtual void DrawLabel(
                          wxDC& dc,
                          wxWindow* wnd,


@@ -305,8 +338,8 @@ public:
                          wxWindow* wnd,
                          const wxAuiToolBarItem& item) = 0;
 
                          wxWindow* wnd,
                          const wxAuiToolBarItem& item) = 0;
 

-    virtual int GetElementSize(int element_id) = 0;
-    virtual void SetElementSize(int element_id, int size) = 0;
+    virtual int GetElementSize(int elementId) = 0;
+    virtual void SetElementSize(int elementId, int size) = 0;

 
     virtual int ShowDropDown(
                          wxWindow* wnd,
 
     virtual int ShowDropDown(
                          wxWindow* wnd,


@@ -325,14 +358,21 @@ public:
 
     virtual wxAuiToolBarArt* Clone();
     virtual void SetFlags(unsigned int flags);
 
     virtual wxAuiToolBarArt* Clone();
     virtual void SetFlags(unsigned int flags);

+    virtual unsigned int GetFlags();

     virtual void SetFont(const wxFont& font);
     virtual void SetFont(const wxFont& font);

+    virtual wxFont GetFont();

     virtual void SetTextOrientation(int orientation);
     virtual void SetTextOrientation(int orientation);

+    virtual int GetTextOrientation();

 
     virtual void DrawBackground(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxRect& rect);
 
 
     virtual void DrawBackground(
                 wxDC& dc,
                 wxWindow* wnd,
                 const wxRect& rect);
 

+    virtual void DrawPlainBackground(wxDC& dc,
+                                  wxWindow* wnd,
+                                  const wxRect& rect);
+

     virtual void DrawLabel(
                 wxDC& dc,
                 wxWindow* wnd,
     virtual void DrawLabel(
                 wxDC& dc,
                 wxWindow* wnd,


@@ -384,30 +424,30 @@ public:
                 const wxAuiToolBarItem& item);
 
     virtual int GetElementSize(int element);
                 const wxAuiToolBarItem& item);
 
     virtual int GetElementSize(int element);

-    virtual void SetElementSize(int element_id, int size);
+    virtual void SetElementSize(int elementId, int size);

 
     virtual int ShowDropDown(wxWindow* wnd,
                              const wxAuiToolBarItemArray& items);
 
 protected:
 
 
     virtual int ShowDropDown(wxWindow* wnd,
                              const wxAuiToolBarItemArray& items);
 
 protected:
 

-    wxBitmap m_button_dropdown_bmp;
-    wxBitmap m_disabled_button_dropdown_bmp;
-    wxBitmap m_overflow_bmp;
-    wxBitmap m_disabled_overflow_bmp;
-    wxColour m_base_colour;
-    wxColour m_highlight_colour;
+    wxBitmap m_buttonDropDownBmp;
+    wxBitmap m_disabledButtonDropDownBmp;
+    wxBitmap m_overflowBmp;
+    wxBitmap m_disabledOverflowBmp;
+    wxColour m_baseColour;
+    wxColour m_highlightColour;

     wxFont m_font;
     unsigned int m_flags;
     wxFont m_font;
     unsigned int m_flags;

-    int m_text_orientation;
+    int m_textOrientation;

 
 

-    wxPen m_gripper_pen1;
-    wxPen m_gripper_pen2;
-    wxPen m_gripper_pen3;
+    wxPen m_gripperPen1;
+    wxPen m_gripperPen2;
+    wxPen m_gripperPen3;

 
 

-    int m_separator_size;
-    int m_gripper_size;
-    int m_overflow_size;
+    int m_separatorSize;
+    int m_gripperSize;
+    int m_overflowSize;

 };
 
 
 };
 
 


@@ -416,15 +456,27 @@ protected:
 class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
 {
 public:
 class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl
 {
 public:

+    wxAuiToolBar() { Init(); }

 
     wxAuiToolBar(wxWindow* parent,
 
     wxAuiToolBar(wxWindow* parent,

-                 wxWindowID id = -1,
-                 const wxPoint& position = wxDefaultPosition,
+                 wxWindowID id = wxID_ANY,
+                 const wxPoint& pos = wxDefaultPosition,

                  const wxSize& size = wxDefaultSize,
                  const wxSize& size = wxDefaultSize,

-                 long style = wxAUI_TB_DEFAULT_STYLE);
-    ~wxAuiToolBar();
+                 long style = wxAUI_TB_DEFAULT_STYLE)
+    {
+        Init();
+        Create(parent, id, pos, size, style);
+    }
+
+    virtual ~wxAuiToolBar();

 
 

-    void SetWindowStyleFlag(long style);
+    bool Create(wxWindow* parent,
+                wxWindowID id = wxID_ANY,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                long style = wxAUI_TB_DEFAULT_STYLE);
+
+    virtual void SetWindowStyleFlag(long style);

 
     void SetArtProvider(wxAuiToolBarArt* art);
     wxAuiToolBarArt* GetArtProvider() const;
 
     void SetArtProvider(wxAuiToolBarArt* art);
     wxAuiToolBarArt* GetArtProvider() const;


@@ -432,66 +484,66 @@ public:
     bool SetFont(const wxFont& font);
 
 
     bool SetFont(const wxFont& font);
 
 

-    void AddTool(int tool_id,
+    wxAuiToolBarItem* AddTool(int toolId,

                  const wxString& label,
                  const wxBitmap& bitmap,
                  const wxString& label,
                  const wxBitmap& bitmap,

-                 const wxString& short_help_string = wxEmptyString,
+                 const wxString& shortHelpString = wxEmptyString,

                  wxItemKind kind = wxITEM_NORMAL);
 
                  wxItemKind kind = wxITEM_NORMAL);
 

-    void AddTool(int tool_id,
+    wxAuiToolBarItem* AddTool(int toolId,

                  const wxString& label,
                  const wxBitmap& bitmap,
                  const wxString& label,
                  const wxBitmap& bitmap,

-                 const wxBitmap& disabled_bitmap,
+                 const wxBitmap& disabledBitmap,

                  wxItemKind kind,
                  wxItemKind kind,

-                 const wxString& short_help_string,
-                 const wxString& long_help_string,
-                 wxObject* client_data);
+                 const wxString& shortHelpString,
+                 const wxString& longHelpString,
+                 wxObject* clientData);

 
 

-    void AddTool(int tool_id,
+    wxAuiToolBarItem* AddTool(int toolId,

                  const wxBitmap& bitmap,
                  const wxBitmap& bitmap,

-                 const wxBitmap& disabled_bitmap,
+                 const wxBitmap& disabledBitmap,

                  bool toggle = false,
                  bool toggle = false,

-                 wxObject* client_data = NULL,
-                 const wxString& short_help_string = wxEmptyString,
-                 const wxString& long_help_string = wxEmptyString)
+                 wxObject* clientData = NULL,
+                 const wxString& shortHelpString = wxEmptyString,
+                 const wxString& longHelpString = wxEmptyString)

     {
     {

-        AddTool(tool_id,
+        return AddTool(toolId,

                 wxEmptyString,
                 bitmap,
                 wxEmptyString,
                 bitmap,

-                disabled_bitmap,
+                disabledBitmap,

                 toggle ? wxITEM_CHECK : wxITEM_NORMAL,
                 toggle ? wxITEM_CHECK : wxITEM_NORMAL,

-                short_help_string,
-                long_help_string,
-                client_data);
+                shortHelpString,
+                longHelpString,
+                clientData);

     }
 
     }
 

-    void AddLabel(int tool_id,
+    wxAuiToolBarItem* AddLabel(int toolId,

                   const wxString& label = wxEmptyString,
                   const int width = -1);
                   const wxString& label = wxEmptyString,
                   const int width = -1);

-    void AddControl(wxControl* control,
+    wxAuiToolBarItem* AddControl(wxControl* control,

                     const wxString& label = wxEmptyString);
                     const wxString& label = wxEmptyString);

-    void AddSeparator();
-    void AddSpacer(int pixels);
-    void AddStretchSpacer(int proportion = 1);
+    wxAuiToolBarItem* AddSeparator();
+    wxAuiToolBarItem* AddSpacer(int pixels);
+    wxAuiToolBarItem* AddStretchSpacer(int proportion = 1);

 
     bool Realize();
 
 
     bool Realize();
 

-    wxControl* FindControl(int window_id);
+    wxControl* FindControl(int windowId);

     wxAuiToolBarItem* FindToolByPosition(wxCoord x, wxCoord y) const;
     wxAuiToolBarItem* FindToolByIndex(int idx) const;
     wxAuiToolBarItem* FindToolByPosition(wxCoord x, wxCoord y) const;
     wxAuiToolBarItem* FindToolByIndex(int idx) const;

-    wxAuiToolBarItem* FindTool(int tool_id) const;
+    wxAuiToolBarItem* FindTool(int toolId) const;

 
     void ClearTools() { Clear() ; }
     void Clear();
 
     void ClearTools() { Clear() ; }
     void Clear();

-    bool DeleteTool(int tool_id);
-    bool DeleteByIndex(int tool_id);
+    bool DeleteTool(int toolId);
+    bool DeleteByIndex(int toolId);

 
     size_t GetToolCount() const;
 
     size_t GetToolCount() const;

-    int GetToolPos(int tool_id) const { return GetToolIndex(tool_id); }
-    int GetToolIndex(int tool_id) const;
-    bool GetToolFits(int tool_id) const;
-    wxRect GetToolRect(int tool_id) const;
-    bool GetToolFitsByIndex(int tool_id) const;
+    int GetToolPos(int toolId) const { return GetToolIndex(toolId); }
+    int GetToolIndex(int toolId) const;
+    bool GetToolFits(int toolId) const;
+    wxRect GetToolRect(int toolId) const;
+    bool GetToolFitsByIndex(int toolId) const;

     bool GetToolBarFits() const;
 
     void SetMargins(const wxSize& size) { SetMargins(size.x, size.x, size.y, size.y); }
     bool GetToolBarFits() const;
 
     void SetMargins(const wxSize& size) { SetMargins(size.x, size.x, size.y, size.y); }


@@ -507,14 +559,14 @@ public:
     bool GetGripperVisible() const;
     void SetGripperVisible(bool visible);
 
     bool GetGripperVisible() const;
     void SetGripperVisible(bool visible);
 

-    void ToggleTool(int tool_id, bool state);
-    bool GetToolToggled(int tool_id) const;
+    void ToggleTool(int toolId, bool state);
+    bool GetToolToggled(int toolId) const;

 
 

-    void EnableTool(int tool_id, bool state);
-    bool GetToolEnabled(int tool_id) const;
+    void EnableTool(int toolId, bool state);
+    bool GetToolEnabled(int toolId) const;

 
 

-    void SetToolDropDown(int tool_id, bool dropdown);
-    bool GetToolDropDown(int tool_id) const;
+    void SetToolDropDown(int toolId, bool dropdown);
+    bool GetToolDropDown(int toolId) const;

 
     void SetToolBorderPadding(int padding);
     int  GetToolBorderPadding() const;
 
     void SetToolBorderPadding(int padding);
     int  GetToolBorderPadding() const;


@@ -525,31 +577,39 @@ public:
     void SetToolPacking(int packing);
     int  GetToolPacking() const;
 
     void SetToolPacking(int packing);
     int  GetToolPacking() const;
 

-    void SetToolProportion(int tool_id, int proportion);
-    int  GetToolProportion(int tool_id) const;
+    void SetToolProportion(int toolId, int proportion);
+    int  GetToolProportion(int toolId) const;

 
     void SetToolSeparation(int separation);
     int GetToolSeparation() const;
 
 
     void SetToolSeparation(int separation);
     int GetToolSeparation() const;
 

-    void SetToolSticky(int tool_id, bool sticky);
-    bool GetToolSticky(int tool_id) const;
+    void SetToolSticky(int toolId, bool sticky);
+    bool GetToolSticky(int toolId) const;

 
 

-    wxString GetToolLabel(int tool_id) const;
-    void SetToolLabel(int tool_id, const wxString& label);
+    wxString GetToolLabel(int toolId) const;
+    void SetToolLabel(int toolId, const wxString& label);

 
 

-    wxBitmap GetToolBitmap(int tool_id) const;
-    void SetToolBitmap(int tool_id, const wxBitmap& bitmap);
+    wxBitmap GetToolBitmap(int toolId) const;
+    void SetToolBitmap(int toolId, const wxBitmap& bitmap);

 
 

-    wxString GetToolShortHelp(int tool_id) const;
-    void SetToolShortHelp(int tool_id, const wxString& help_string);
+    wxString GetToolShortHelp(int toolId) const;
+    void SetToolShortHelp(int toolId, const wxString& helpString);

 
 

-    wxString GetToolLongHelp(int tool_id) const;
-    void SetToolLongHelp(int tool_id, const wxString& help_string);
+    wxString GetToolLongHelp(int toolId) const;
+    void SetToolLongHelp(int toolId, const wxString& helpString);

 
     void SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend,
                                 const wxAuiToolBarItemArray& append);
 
 
     void SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend,
                                 const wxAuiToolBarItemArray& append);
 

+    // get size of hint rectangle for a particular dock location
+    wxSize GetHintSize(int dockDirection) const;
+    bool IsPaneValid(const wxAuiPaneInfo& pane) const;
+
+    // Override to call DoIdleUpdate().
+    virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
+

 protected:
 protected:

+    void Init();

 
     virtual void OnCustomRender(wxDC& WXUNUSED(dc),
                                 const wxAuiToolBarItem& WXUNUSED(item),
 
     virtual void OnCustomRender(wxDC& WXUNUSED(dc),
                                 const wxAuiToolBarItem& WXUNUSED(item),


@@ -588,6 +648,7 @@ protected: // handlers
     void OnMiddleUp(wxMouseEvent& evt);
     void OnMotion(wxMouseEvent& evt);
     void OnLeaveWindow(wxMouseEvent& evt);
     void OnMiddleUp(wxMouseEvent& evt);
     void OnMotion(wxMouseEvent& evt);
     void OnLeaveWindow(wxMouseEvent& evt);

+    void OnCaptureLost(wxMouseCaptureLostEvent& evt);

     void OnSetCursor(wxSetCursorEvent& evt);
 
 protected:
     void OnSetCursor(wxSetCursorEvent& evt);
 
 protected:


@@ -595,31 +656,42 @@ protected:
     wxAuiToolBarItemArray m_items;      // array of toolbar items
     wxAuiToolBarArt* m_art;             // art provider
     wxBoxSizer* m_sizer;                // main sizer for toolbar
     wxAuiToolBarItemArray m_items;      // array of toolbar items
     wxAuiToolBarArt* m_art;             // art provider
     wxBoxSizer* m_sizer;                // main sizer for toolbar

-    wxAuiToolBarItem* m_action_item;    // item that's being acted upon (pressed)
-    wxAuiToolBarItem* m_tip_item;       // item that has its tooltip shown
+    wxAuiToolBarItem* m_actionItem;    // item that's being acted upon (pressed)
+    wxAuiToolBarItem* m_tipItem;       // item that has its tooltip shown

     wxBitmap m_bitmap;                  // double-buffer bitmap
     wxBitmap m_bitmap;                  // double-buffer bitmap

-    wxSizerItem* m_gripper_sizer_item;
-    wxSizerItem* m_overflow_sizer_item;
-    wxSize m_absolute_min_size;
-    wxPoint m_action_pos;               // position of left-mouse down
-    wxAuiToolBarItemArray m_custom_overflow_prepend;
-    wxAuiToolBarItemArray m_custom_overflow_append;
-
-    int m_button_width;
-    int m_button_height;
-    int m_sizer_element_count;
-    int m_left_padding;
-    int m_right_padding;
-    int m_top_padding;
-    int m_bottom_padding;
-    int m_tool_packing;
-    int m_tool_border_padding;
-    int m_tool_text_orientation;
-    int m_overflow_state;
+    wxSizerItem* m_gripperSizerItem;
+    wxSizerItem* m_overflowSizerItem;
+    wxSize m_absoluteMinSize;
+    wxPoint m_actionPos;               // position of left-mouse down
+    wxAuiToolBarItemArray m_customOverflowPrepend;
+    wxAuiToolBarItemArray m_customOverflowAppend;
+
+    int m_buttonWidth;
+    int m_buttonHeight;
+    int m_sizerElementCount;
+    int m_leftPadding;
+    int m_rightPadding;
+    int m_topPadding;
+    int m_bottomPadding;
+    int m_toolPacking;
+    int m_toolBorderPadding;
+    int m_toolTextOrientation;
+    int m_overflowState;

     bool m_dragging;
     bool m_dragging;

-    bool m_gripper_visible;
-    bool m_overflow_visible;
-    long m_style;
+    bool m_gripperVisible;
+    bool m_overflowVisible;
+
+    bool RealizeHelper(wxClientDC& dc, bool horizontal);
+    static bool IsPaneValid(long style, const wxAuiPaneInfo& pane);
+    bool IsPaneValid(long style) const;
+    void SetArtFlags() const;
+    wxOrientation m_orientation;
+    wxSize m_horzHintSize;
+    wxSize m_vertHintSize;
+
+private:
+    // Common part of OnLeaveWindow() and OnCaptureLost().
+    void DoResetMouseState();

 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxAuiToolBar)
 
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxAuiToolBar)


@@ -632,48 +704,53 @@ protected:
 
 #ifndef SWIG
 
 
 #ifndef SWIG
 

-BEGIN_DECLARE_EVENT_TYPES()
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, 0)
-    DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, 0)
-END_DECLARE_EVENT_TYPES()
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent );

 
 typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
 
 #define wxAuiToolBarEventHandler(func) \
 
 typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&);
 
 #define wxAuiToolBarEventHandler(func) \

-    (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxAuiToolBarEventFunction, &func)
+    wxEVENT_HANDLER_CAST(wxAuiToolBarEventFunction, func)

 
 #define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \
 
 #define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))

 #define EVT_AUITOOLBAR_OVERFLOW_CLICK(winid, fn) \
 #define EVT_AUITOOLBAR_OVERFLOW_CLICK(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_OVERFLOW_CLICK, winid, wxAuiToolBarEventHandler(fn))

 #define EVT_AUITOOLBAR_RIGHT_CLICK(winid, fn) \
 #define EVT_AUITOOLBAR_RIGHT_CLICK(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_RIGHT_CLICK, winid, wxAuiToolBarEventHandler(fn))

 #define EVT_AUITOOLBAR_MIDDLE_CLICK(winid, fn) \
 #define EVT_AUITOOLBAR_MIDDLE_CLICK(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_MIDDLE_CLICK, winid, wxAuiToolBarEventHandler(fn))

 #define EVT_AUITOOLBAR_BEGIN_DRAG(winid, fn) \
 #define EVT_AUITOOLBAR_BEGIN_DRAG(winid, fn) \

-    wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, winid, wxAuiToolBarEventHandler(fn))
+    wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_BEGIN_DRAG, winid, wxAuiToolBarEventHandler(fn))

 
 #else
 
 // wxpython/swig event work
 
 #else
 
 // wxpython/swig event work

-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK;
-%constant wxEventType wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG;
+%constant wxEventType wxEVT_AUITOOLBAR_TOOL_DROPDOWN;
+%constant wxEventType wxEVT_AUITOOLBAR_OVERFLOW_CLICK;
+%constant wxEventType wxEVT_AUITOOLBAR_RIGHT_CLICK;
+%constant wxEventType wxEVT_AUITOOLBAR_MIDDLE_CLICK;
+%constant wxEventType wxEVT_AUITOOLBAR_BEGIN_DRAG;

 
 %pythoncode {
 
 %pythoncode {

-    EVT_AUITOOLBAR_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, 1 )
-    EVT_AUITOOLBAR_OVERFLOW_CLICK = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, 1 )
-    EVT_AUITOOLBAR_RIGHT_CLICK = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, 1 )
-    EVT_AUITOOLBAR_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, 1 )
-    EVT_AUITOOLBAR_BEGIN_DRAG = wx.PyEventBinder( wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, 1 )
+    EVT_AUITOOLBAR_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_AUITOOLBAR_TOOL_DROPDOWN, 1 )
+    EVT_AUITOOLBAR_OVERFLOW_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_OVERFLOW_CLICK, 1 )
+    EVT_AUITOOLBAR_RIGHT_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_RIGHT_CLICK, 1 )
+    EVT_AUITOOLBAR_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_MIDDLE_CLICK, 1 )
+    EVT_AUITOOLBAR_BEGIN_DRAG = wx.PyEventBinder( wxEVT_AUITOOLBAR_BEGIN_DRAG, 1 )

 }
 #endif  // SWIG
 
 }
 #endif  // SWIG
 

+// old wxEVT_COMMAND_* constants
+#define wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN    wxEVT_AUITOOLBAR_TOOL_DROPDOWN
+#define wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK   wxEVT_AUITOOLBAR_OVERFLOW_CLICK
+#define wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK      wxEVT_AUITOOLBAR_RIGHT_CLICK
+#define wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK     wxEVT_AUITOOLBAR_MIDDLE_CLICK
+#define wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG       wxEVT_AUITOOLBAR_BEGIN_DRAG
+

 #endif  // wxUSE_AUI
 #endif  // _WX_AUIBAR_H_
 
 #endif  // wxUSE_AUI
 #endif  // _WX_AUIBAR_H_