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

initialize wxBitmapButton members

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-05-04 11:57:39 +00:00
parent 047ac72bbe
commit c3dfaa10a6
4 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/wx/gtk/bmpbuttn.h
View File

@@ -22,7 +22,8 @@
class wxBitmapButton: public wxBitmapButtonBase class wxBitmapButton: public wxBitmapButtonBase
{ {
public: public:
wxBitmapButton(); wxBitmapButton() { Init(); }
wxBitmapButton(wxWindow *parent, wxBitmapButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,
@@ -32,8 +33,11 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxButtonNameStr)
{ {
Init();
Create(parent, id, bitmap, pos, size, style, validator, name); Create(parent, id, bitmap, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,
@@ -43,13 +47,13 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
virtual void SetDefault();
virtual bool Enable(bool enable = TRUE);
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
wxString GetLabel() const; wxString GetLabel() const;
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
virtual void SetDefault();
virtual bool Enable(bool enable = TRUE);
// implementation // implementation
// -------------- // --------------
@@ -59,12 +63,14 @@ public:
void EndSelect(); void EndSelect();
void ApplyWidgetStyle(); void ApplyWidgetStyle();
bool m_hasFocus; bool m_hasFocus:1;
bool m_isSelected; bool m_isSelected:1;
protected: protected:
virtual void OnSetBitmap(); virtual void OnSetBitmap();
void Init();
private: private:
DECLARE_DYNAMIC_CLASS(wxBitmapButton) DECLARE_DYNAMIC_CLASS(wxBitmapButton)
}; };

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

@@ -22,7 +22,8 @@
class wxBitmapButton: public wxBitmapButtonBase class wxBitmapButton: public wxBitmapButtonBase
{ {
public: public:
wxBitmapButton(); wxBitmapButton() { Init(); }
wxBitmapButton(wxWindow *parent, wxBitmapButton(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,
@@ -32,8 +33,11 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr) const wxString& name = wxButtonNameStr)
{ {
Init();
Create(parent, id, bitmap, pos, size, style, validator, name); Create(parent, id, bitmap, pos, size, style, validator, name);
} }
bool Create(wxWindow *parent, bool Create(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxBitmap& bitmap, const wxBitmap& bitmap,
@@ -43,13 +47,13 @@ public:
const wxValidator& validator = wxDefaultValidator, const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr); const wxString& name = wxButtonNameStr);
virtual void SetDefault();
virtual bool Enable(bool enable = TRUE);
void SetLabel( const wxString &label ); void SetLabel( const wxString &label );
wxString GetLabel() const; wxString GetLabel() const;
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
virtual void SetDefault();
virtual bool Enable(bool enable = TRUE);
// implementation // implementation
// -------------- // --------------
@@ -59,12 +63,14 @@ public:
void EndSelect(); void EndSelect();
void ApplyWidgetStyle(); void ApplyWidgetStyle();
bool m_hasFocus; bool m_hasFocus:1;
bool m_isSelected; bool m_isSelected:1;
protected: protected:
virtual void OnSetBitmap(); virtual void OnSetBitmap();
void Init();
private: private:
DECLARE_DYNAMIC_CLASS(wxBitmapButton) DECLARE_DYNAMIC_CLASS(wxBitmapButton)
}; };

15
src/gtk/bmpbuttn.cpp
View File

@@ -109,13 +109,20 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
wxBitmapButton::wxBitmapButton() void wxBitmapButton::Init()
{ {
m_hasFocus =
m_isSelected = FALSE;
} }
bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, bool wxBitmapButton::Create( wxWindow *parent,
const wxPoint &pos, const wxSize &size, wxWindowID id,
long style, const wxValidator& validator, const wxString &name ) const wxBitmap& bitmap,
const wxPoint& pos,
const wxSize& size,
long style,
const wxValidator& validator,
const wxString &name )
{ {
m_needParent = TRUE; m_needParent = TRUE;
m_acceptsFocus = TRUE; m_acceptsFocus = TRUE;

15
src/gtk1/bmpbuttn.cpp
View File

@@ -109,13 +109,20 @@ static void gtk_bmpbutton_release_callback( GtkWidget *WXUNUSED(widget), wxBitma
IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton) IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton,wxButton)
wxBitmapButton::wxBitmapButton() void wxBitmapButton::Init()
{ {
m_hasFocus =
m_isSelected = FALSE;
} }
bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap &bitmap, bool wxBitmapButton::Create( wxWindow *parent,
const wxPoint &pos, const wxSize &size, wxWindowID id,
long style, const wxValidator& validator, const wxString &name ) const wxBitmap& bitmap,
const wxPoint& pos,
const wxSize& size,
long style,
const wxValidator& validator,
const wxString &name )
{ {
m_needParent = TRUE; m_needParent = TRUE;
m_acceptsFocus = TRUE; m_acceptsFocus = TRUE;