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

GTK wxBitmapButton added

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-05-28 17:44:04 +00:00
parent ef77f91e5b
commit 151ccd11af
10 changed files with 272 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/wx/gtk1/bitmap.h
View File

@@ -25,11 +25,6 @@
// classes
//-----------------------------------------------------------------------------
class wxDC;
class wxPaintDC;
class wxMemoryDC;
class wxToolBarGTK;
class wxMask;
class wxBitmap;
@@ -49,13 +44,8 @@ class wxMask: public wxObject
wxMask( const wxBitmap& bitmap );
~wxMask(void);
private:
public:
friend wxBitmap;
friend wxDC;
friend wxPaintDC;
friend wxToolBarGTK;
GdkBitmap *GetBitmap(void) const;
protected:
@@ -103,12 +93,7 @@ class wxBitmap: public wxObject
wxPalette *GetColourMap(void) const
{ return GetPalette(); };
private:
friend wxDC;
friend wxPaintDC;
friend wxMemoryDC;
friend wxToolBarGTK;
public:
GdkPixmap *GetPixmap(void) const;

28
include/wx/gtk1/bmpbuttn.h
View File

@@ -27,8 +27,36 @@
class wxBitmapButton;
//-----------------------------------------------------------------------------
// global data
//-----------------------------------------------------------------------------
extern const char *wxButtonNameStr;
//-----------------------------------------------------------------------------
// wxBitmapButton
//-----------------------------------------------------------------------------
class wxBitmapButton: public wxControl
{
DECLARE_DYNAMIC_CLASS(wxBitmapButton)
public:
wxBitmapButton(void);
wxBitmapButton( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr );
bool Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
const long style = 0, const wxString &name = wxButtonNameStr );
void SetDefault(void);
void SetLabel( const wxString &label );
wxString GetLabel(void) const;
public:
wxBitmap m_bitmap;
};
#endif // __BMPBUTTONH__