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

merge #4 from 2.6 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-01-10 23:15:38 +00:00
parent f01fbad837
commit 17991ec034
5 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wxPython/src/_menu.i
View File

@@ -374,7 +374,9 @@ public:
// SetText()
virtual void SetAccel(wxAcceleratorEntry *accel);
void SetBitmap(const wxBitmap& bitmap);
const wxBitmap& GetBitmap();
// wxOwnerDrawn methods
#ifdef __WXMSW__
void SetFont(const wxFont& font);
@@ -405,8 +407,10 @@ public:
wxColour GetTextColour() { return wxNullColour; }
void SetBackgroundColour(const wxColour& colBack) {}
wxColour GetBackgroundColour() { return wxNullColour; }
void SetBitmaps(const wxBitmap& bmpChecked,
const wxBitmap& bmpUnchecked = wxNullBitmap) {}
const wxBitmap& bmpUnchecked = wxNullBitmap)
{ self->SetBitmap( bmpChecked ); }
void SetDisabledBitmap( const wxBitmap& bmpDisabled ) {}
const wxBitmap& GetDisabledBitmap() const { return wxNullBitmap; }
@@ -419,9 +423,6 @@ public:
void ResetOwnerDrawn() {}
}
#endif
void SetBitmap(const wxBitmap& bitmap);
const wxBitmap& GetBitmap();
};
//---------------------------------------------------------------------------