projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed drawing of the lines data, also ensure that only tuples are
[wxWidgets.git]
/
include
/
wx
/
gtk
/
bmpbuttn.h
diff --git
a/include/wx/gtk/bmpbuttn.h
b/include/wx/gtk/bmpbuttn.h
index baae20d297ed112c558b5ebbdff79d17a4e00763..5a27135aba932c82af5e9f5832fb0b84f3575745 100644
(file)
--- a/
include/wx/gtk/bmpbuttn.h
+++ b/
include/wx/gtk/bmpbuttn.h
@@
-1,17
+1,17
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: bmpbutton.h
+// Name:
wx/gtk/
bmpbutton.h
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef __BMPBUTTONH__
#define __BMPBUTTONH__
/////////////////////////////////////////////////////////////////////////////
#ifndef __BMPBUTTONH__
#define __BMPBUTTONH__
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma interface
#endif
#pragma interface
#endif
@@
-22,7
+22,8
@@
class wxBitmapButton: public wxBitmapButtonBase
{
public:
class wxBitmapButton: public wxBitmapButtonBase
{
public:
- wxBitmapButton();
+ wxBitmapButton() { Init(); }
+
wxBitmapButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
wxBitmapButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
@@
-32,8
+33,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,29
+47,30
@@
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 );
wxString GetLabel() const;
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
void SetLabel( const wxString &label );
wxString GetLabel() const;
virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); }
-
+
+ virtual void SetDefault();
+ virtual bool Enable(bool enable = TRUE);
+
// implementation
// --------------
// implementation
// --------------
-
+
void HasFocus();
void NotFocus();
void StartSelect();
void EndSelect();
void HasFocus();
void NotFocus();
void StartSelect();
void EndSelect();
- void SetBitmap();
- void ApplyWidgetStyle();
-
- bool m_hasFocus;
- bool m_isSelected;
-
+ void ApplyWidgetStyle();
+
+ bool m_hasFocus:1;
+ bool m_isSelected:1;
+
protected:
virtual void OnSetBitmap();
protected:
virtual void OnSetBitmap();
+ void Init();
+
private:
DECLARE_DYNAMIC_CLASS(wxBitmapButton)
};
private:
DECLARE_DYNAMIC_CLASS(wxBitmapButton)
};