projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made wxString::Replace, Matches and Find work with any form of string argument
[wxWidgets.git]
/
include
/
wx
/
msw
/
bmpbuttn.h
diff --git
a/include/wx/msw/bmpbuttn.h
b/include/wx/msw/bmpbuttn.h
index fc92a3136339b2455e855086af992ba3794069e9..93ee168fa79f72db9971063c7269b76d4b069f84 100644
(file)
--- a/
include/wx/msw/bmpbuttn.h
+++ b/
include/wx/msw/bmpbuttn.h
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: bmpbuttn.h
+// Name:
wx/msw/
bmpbuttn.h
// Purpose: wxBitmapButton class
// Author: Julian Smart
// Modified by:
// Purpose: wxBitmapButton class
// Author: Julian Smart
// Modified by:
@@
-12,21
+12,15
@@
#ifndef _WX_BMPBUTTN_H_
#define _WX_BMPBUTTN_H_
#ifndef _WX_BMPBUTTN_H_
#define _WX_BMPBUTTN_H_
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "bmpbuttn.h"
-#endif
-
#include "wx/button.h"
#include "wx/bitmap.h"
#include "wx/brush.h"
#include "wx/button.h"
#include "wx/bitmap.h"
#include "wx/brush.h"
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
+class WXDLLEXPORT wxBitmapButton : public wxBitmapButtonBase
{
public:
{
public:
- wxBitmapButton()
- { m_marginX = m_marginY = wxDEFAULT_BUTTON_MARGIN; }
+ wxBitmapButton()
{ }
+
wxBitmapButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
wxBitmapButton(wxWindow *parent,
wxWindowID id,
const wxBitmap& bitmap,
@@
-57,12
+51,23
@@
public:
virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
protected:
virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
protected:
+ // reimplement some base class virtuals
virtual wxSize DoGetBestSize() const;
virtual wxSize DoGetBestSize() const;
+ virtual void OnSetBitmap();
+
+ // invalidate m_brushDisabled when system colours change
+ void OnSysColourChanged(wxSysColourChangedEvent& event);
+ // change the currently bitmap if we have a hover one
+ void OnMouseEnterOrLeave(wxMouseEvent& event);
+
+
+ // the brush we use to draw disabled buttons
wxBrush m_brushDisabled;
wxBrush m_brushDisabled;
+
+ DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
};
DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapButton)
};
-#endif
- // _WX_BMPBUTTN_H_
+#endif // _WX_BMPBUTTN_H_