don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 4c24ded4df3114c3d16da7c6865282c0bcd79716..b8f6ff453bc39b6a4c9536f92aafe15bec0ad717 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,10 @@
 #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 wxSizerItem;

 
 enum wxAuiToolBarStyle
 {
 
 enum wxAuiToolBarStyle
 {


@@ -26,7 +30,8 @@ enum wxAuiToolBarStyle
     wxAUI_TB_GRIPPER       = 1 << 3,
     wxAUI_TB_OVERFLOW      = 1 << 4,
     wxAUI_TB_VERTICAL      = 1 << 5,
     wxAUI_TB_GRIPPER       = 1 << 3,
     wxAUI_TB_OVERFLOW      = 1 << 4,
     wxAUI_TB_VERTICAL      = 1 << 5,

-    wxAUI_TB_HORZ_TEXT     = ((1 << 6) | wxAUI_TB_TEXT),
+    wxAUI_TB_HORZ_LAYOUT   = 1 << 6,
+    wxAUI_TB_HORZ_TEXT     = (wxAUI_TB_HORZ_LAYOUT | wxAUI_TB_TEXT),

     wxAUI_TB_DEFAULT_STYLE = 0
 };
 
     wxAUI_TB_DEFAULT_STYLE = 0
 };
 


@@ -83,28 +88,29 @@ public:
     int GetToolId() const  { return tool_id; }
     void SetToolId(int id) { tool_id = id;   }
 
     int GetToolId() const  { return tool_id; }
     void SetToolId(int id) { tool_id = id;   }
 

-public:
+private:
+

     bool is_dropdown_clicked;
     wxPoint click_pt;
     wxRect rect;
     int tool_id;
 
     bool is_dropdown_clicked;
     wxPoint click_pt;
     wxRect rect;
     int tool_id;
 

-#ifndef SWIG

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

-#endif

 };
 
 
 class WXDLLIMPEXP_AUI wxAuiToolBarItem
 {
 };
 
 
 class WXDLLIMPEXP_AUI wxAuiToolBarItem
 {

+    friend class wxAuiToolBar;
+

 public:
 
     wxAuiToolBarItem()
     {
         window = NULL;
         sizer_item = NULL;
 public:
 
     wxAuiToolBarItem()
     {
         window = NULL;
         sizer_item = NULL;

-        space_pixels = 0;
+        spacer_pixels = 0;

         id = 0;
         kind = wxITEM_NORMAL;
         state = 0;  // normal, enabled
         id = 0;
         kind = wxITEM_NORMAL;
         state = 0;  // normal, enabled


@@ -113,6 +119,7 @@ public:
         dropdown = true;
         sticky = true;
         user_data = 0;
         dropdown = true;
         sticky = true;
         user_data = 0;

+        alignment = wxALIGN_CENTER;

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


@@ -137,7 +144,7 @@ public:
         long_help = c.long_help;
         sizer_item = c.sizer_item;
         min_size = c.min_size;
         long_help = c.long_help;
         sizer_item = c.sizer_item;
         min_size = c.min_size;

-        space_pixels = c.space_pixels;
+        spacer_pixels = c.spacer_pixels;

         id = c.id;
         kind = c.kind;
         state = c.state;
         id = c.id;
         kind = c.kind;
         state = c.state;


@@ -146,9 +153,68 @@ public:
         dropdown = c.dropdown;
         sticky = c.sticky;
         user_data = c.user_data;
         dropdown = c.dropdown;
         sticky = c.sticky;
         user_data = c.user_data;

+        alignment = c.alignment;

     }
 
     }
 

-public:
+
+    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; }
+
+    void SetAlignment(int l) { alignment = l; }
+    int GetAlignment() const { return alignment; }
+
+private:

 
     wxWindow* window;          // item's associated window
     wxString label;            // label displayed on the item
 
     wxWindow* window;          // item's associated window
     wxString label;            // label displayed on the item


@@ -159,7 +225,7 @@ public:
     wxString long_help;        // long help (for status bar)
     wxSizerItem* sizer_item;   // sizer item
     wxSize min_size;           // item's minimum size
     wxString long_help;        // long help (for status bar)
     wxSizerItem* sizer_item;   // sizer item
     wxSize min_size;           // item's minimum size

-    int space_pixels;          // size of a spacer
+    int spacer_pixels;         // size of a spacer

     int id;                    // item's id
     int kind;                  // item's kind
     int state;                 // state
     int id;                    // item's id
     int kind;                  // item's kind
     int state;                 // state


@@ -168,6 +234,7 @@ public:
     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
     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

+    int alignment;             // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other

 };
 
 #ifndef SWIG
 };
 
 #ifndef SWIG


@@ -188,8 +255,11 @@ 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,
 
     virtual void DrawBackground(
                          wxDC& dc,


@@ -266,8 +336,11 @@ 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,
 
     virtual void DrawBackground(
                 wxDC& dc,


@@ -363,9 +436,10 @@ public:
                  const wxPoint& position = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxAUI_TB_DEFAULT_STYLE);
                  const wxPoint& position = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxAUI_TB_DEFAULT_STYLE);

-    ~wxAuiToolBar();
+    virtual ~wxAuiToolBar();

 
     void SetWindowStyleFlag(long style);
 
     void SetWindowStyleFlag(long style);

+    long GetWindowStyleFlag() const;

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


@@ -373,13 +447,13 @@ public:
     bool SetFont(const wxFont& font);
 
 
     bool SetFont(const wxFont& font);
 
 

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

                  const wxString& label,
                  const wxBitmap& bitmap,
                  const wxString& short_help_string = wxEmptyString,
                  wxItemKind kind = wxITEM_NORMAL);
 
                  const wxString& label,
                  const wxBitmap& bitmap,
                  const wxString& short_help_string = wxEmptyString,
                  wxItemKind kind = wxITEM_NORMAL);
 

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

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


@@ -388,7 +462,7 @@ public:
                  const wxString& long_help_string,
                  wxObject* client_data);
 
                  const wxString& long_help_string,
                  wxObject* client_data);
 

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

                  const wxBitmap& bitmap,
                  const wxBitmap& disabled_bitmap,
                  bool toggle = false,
                  const wxBitmap& bitmap,
                  const wxBitmap& disabled_bitmap,
                  bool toggle = false,


@@ -396,7 +470,7 @@ public:
                  const wxString& short_help_string = wxEmptyString,
                  const wxString& long_help_string = wxEmptyString)
     {
                  const wxString& short_help_string = wxEmptyString,
                  const wxString& long_help_string = wxEmptyString)
     {

-        AddTool(tool_id,
+        return AddTool(tool_id,

                 wxEmptyString,
                 bitmap,
                 disabled_bitmap,
                 wxEmptyString,
                 bitmap,
                 disabled_bitmap,


@@ -406,14 +480,14 @@ public:
                 client_data);
     }
 
                 client_data);
     }
 

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

                   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();
 


@@ -573,18 +647,16 @@ 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_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent );
+wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_COMMAND_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) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))
 
 #define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \
     wx__DECLARE_EVT1(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn))