projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added native selection rectangle drawing.
[wxWidgets.git]
/
include
/
wx
/
gtk
/
bmpbuttn.h
diff --git
a/include/wx/gtk/bmpbuttn.h
b/include/wx/gtk/bmpbuttn.h
index 92eda41c8c466f7b4a0ad722885ac115350ba2be..3af18cfeec2417fb912c22eb3fe8b2a2b54be5e8 100644
(file)
--- a/
include/wx/gtk/bmpbuttn.h
+++ b/
include/wx/gtk/bmpbuttn.h
@@
-11,18
+11,15
@@
#ifndef __BMPBUTTONH__
#define __BMPBUTTONH__
#ifndef __BMPBUTTONH__
#define __BMPBUTTONH__
-#ifdef __GNUG__
-#pragma interface
-#endif
-
// ----------------------------------------------------------------------------
// wxBitmapButton
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// wxBitmapButton
// ----------------------------------------------------------------------------
-class wxBitmapButton: public wxBitmapButtonBase
+class
WXDLLIMPEXP_CORE
wxBitmapButton: public wxBitmapButtonBase
{
public:
{
public:
- wxBitmapButton();
+ wxBitmapButton() { Init(); }
+
wxBitmapButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
wxBitmapButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
@@
-32,8
+29,11
@@
public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr)
{
const wxValidator& validator = wxDefaultValidator,
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,
wxWindowID id,
const wxBitmap& bitmap,
bool Create(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
@@
-43,13
+43,12
@@
public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxButtonNameStr);
const wxValidator& validator = wxDefaultValidator,
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;
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
// --------------
@@
-57,13
+56,16
@@
public:
void NotFocus();
void StartSelect();
void EndSelect();
void NotFocus();
void StartSelect();
void EndSelect();
- void ApplyWidgetStyle();
- bool m_hasFocus;
- bool m_isSelected;
+ bool m_hasFocus
:1
;
+ bool m_isSelected
:1
;
protected:
virtual void OnSetBitmap();
protected:
virtual void OnSetBitmap();
+ virtual wxSize DoGetBestSize() const;
+ void DoApplyWidgetStyle(GtkRcStyle *style);
+
+ void Init();
private:
DECLARE_DYNAMIC_CLASS(wxBitmapButton)
private:
DECLARE_DYNAMIC_CLASS(wxBitmapButton)