Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[start of] a wxUniversal implementation of wxToolBar

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-02-27 21:42:48 +00:00
parent 2b69aeaa92
commit 3216dbf5dc
8 changed files with 769 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
include/wx/tbarbase.h
View File

@@ -132,11 +132,13 @@ public:
bool CanBeToggled() const { return m_isToggle; }
// attributes
const wxBitmap& GetBitmap1() const { return m_bitmap1; }
const wxBitmap& GetBitmap2() const { return m_bitmap2; }
const wxBitmap& GetNormalBitmap() const { return m_bitmap1; }
const wxBitmap& GetDisabledBitmap() const { return m_bitmap2; }
const wxBitmap& GetBitmap() const
{ return IsToggled() ? m_bitmap2 : m_bitmap1; }
{ return IsEnabled() ? GetNormalBitmap() : GetDisabledBitmap(); }
wxString GetLabel() const { return m_label; }
wxString GetShortHelp() const { return m_shortHelpString; }
wxString GetLongHelp() const { return m_longHelpString; }
@@ -162,8 +164,10 @@ public:
void Toggle() { Toggle(!IsToggled()); }
void SetBitmap1(const wxBitmap& bmp) { m_bitmap1 = bmp; }
void SetBitmap2(const wxBitmap& bmp) { m_bitmap2 = bmp; }
void SetNormalBitmap(const wxBitmap& bmp) { m_bitmap1 = bmp; }
void SetDisabledBitmap(const wxBitmap& bmp) { m_bitmap2 = bmp; }
void SetLabel(const wxString& label) { m_label = label; }
void SetClientData(wxObject *clientData)
{
@@ -181,6 +185,15 @@ public:
virtual void Detach() { m_tbar = (wxToolBarBase *)NULL; }
virtual void Attach(wxToolBarBase *tbar) { m_tbar = tbar; }
// compatibility only, don't use
#if WXWIN_COMPATIBILITY_2_2
const wxBitmap& GetBitmap1() const { return GetNormalBitmap(); }
const wxBitmap& GetBitmap2() const { return GetDisabledBitmap(); }
void SetBitmap1(const wxBitmap& bmp) { SetNormalBitmap(bmp); }
void SetBitmap2(const wxBitmap& bmp) { SetDisabledBitmap(bmp); }
#endif // WXWIN_COMPATIBILITY_2_2
protected:
wxToolBarBase *m_tbar; // the toolbar to which we belong (may be NULL)
@@ -199,10 +212,13 @@ protected:
bool m_isToggle;
bool m_enabled;
// normal and toggles bitmaps
// normal and disabled bitmaps
wxBitmap m_bitmap1;
wxBitmap m_bitmap2;
// the button label
wxString m_label;
// short and long help strings
wxString m_shortHelpString;
wxString m_longHelpString;
@@ -374,6 +390,9 @@ public:
virtual wxToolBarToolBase *FindToolForPosition(wxCoord x,
wxCoord y) const = 0;
// return TRUE if this is a vertical toolbar, otherwise FALSE
bool IsVertical() const { return HasFlag(wxTB_VERTICAL); }
// event handlers
// --------------