// 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
///////////////////////////////////////////////////////////////////////////////
#if wxUSE_AUI
#include "wx/control.h"
+#include "wx/sizer.h"
+#include "wx/pen.h"
+
+//class WXDLLIMPEXP_FWD_CORE wxSizerItem;
enum wxAuiToolBarStyle
{
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
};
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;
-#ifndef SWIG
private:
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent)
-#endif
};
class WXDLLIMPEXP_AUI wxAuiToolBarItem
{
+ friend class wxAuiToolBar;
+
public:
wxAuiToolBarItem()
{
window = NULL;
sizer_item = NULL;
- space_pixels = 0;
+ spacer_pixels = 0;
id = 0;
kind = wxITEM_NORMAL;
state = 0; // normal, enabled
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;
user_data = c.user_data;
}
-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; }
+
+private:
wxWindow* window; // item's associated window
wxString label; // label displayed on the item
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
const wxPoint& position = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxAUI_TB_DEFAULT_STYLE);
- ~wxAuiToolBar();
+ virtual ~wxAuiToolBar();
void SetWindowStyleFlag(long style);
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);
- void AddTool(int tool_id,
+ wxAuiToolBarItem* AddTool(int tool_id,
const wxString& label,
const wxBitmap& bitmap,
const wxBitmap& disabled_bitmap,
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 wxString& short_help_string = wxEmptyString,
const wxString& long_help_string = wxEmptyString)
{
- AddTool(tool_id,
+ return AddTool(tool_id,
wxEmptyString,
bitmap,
disabled_bitmap,
client_data);
}
- void AddLabel(int tool_id,
+ wxAuiToolBarItem* AddLabel(int tool_id,
const wxString& label = wxEmptyString,
const int width = -1);
- void AddControl(wxControl* control,
+ wxAuiToolBarItem* AddControl(wxControl* control,
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();
#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) \
- (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))
projects / wxWidgets.git / blobdiff