1. fixed wxStaticBox background erasing (or, rather, restored the old bug)

[wxWidgets.git] / include / wx / msw / bmpbuttn.h

diff --git a/include/wx/msw/bmpbuttn.h b/include/wx/msw/bmpbuttn.h
index 86161a9c84ca419b34024061695d83c9b200ce41..8630e49ab10a2da0210809962d467f3ec47e9208 100644 (file)
--- a/include/wx/msw/bmpbuttn.h
+++ b/include/wx/msw/bmpbuttn.h
@@ -5,12 +5,12 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __BMPBUTTNH__
-#define __BMPBUTTNH__
+#ifndef _WX_BMPBUTTN_H_
+#define _WX_BMPBUTTN_H_

 
 #ifdef __GNUG__
 #pragma interface "bmpbuttn.h"
 
 #ifdef __GNUG__
 #pragma interface "bmpbuttn.h"


@@ -18,68 +18,70 @@
 
 #include "wx/button.h"
 
 
 #include "wx/button.h"
 

-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;

 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 class WXDLLEXPORT wxBitmapButton: public wxButton
 {
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 class WXDLLEXPORT wxBitmapButton: public wxButton
 {

-  DECLARE_DYNAMIC_CLASS(wxBitmapButton)
- public:
-  inline wxBitmapButton(void) { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }
-  inline wxBitmapButton(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-  {
-      Create(parent, id, bitmap, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, const wxWindowID id, const wxBitmap& bitmap,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, const long style = wxBU_AUTODRAW,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr);
-
-  virtual void SetLabel(const wxBitmap& bitmap)
-  {
-    SetBitmapLabel(bitmap);
-  }
-
-  virtual void SetBitmapLabel(const wxBitmap& bitmap);
+    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
+
+public:
+    wxBitmapButton() { m_marginX = wxDEFAULT_BUTTON_MARGIN; m_marginY = wxDEFAULT_BUTTON_MARGIN; }
+    wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxButtonNameStr)
+    {
+        Create(parent, id, bitmap, pos, size, style, validator, name);
+    }
+
+    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
+            const wxPoint& pos = wxDefaultPosition,
+            const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
+            const wxValidator& validator = wxDefaultValidator,
+            const wxString& name = wxButtonNameStr);
+
+    virtual void SetLabel(const wxBitmap& bitmap)
+    {
+        SetBitmapLabel(bitmap);
+    }
+
+    virtual void SetBitmapLabel(const wxBitmap& bitmap);

 
 #if WXWIN_COMPATIBILITY
 
 #if WXWIN_COMPATIBILITY

-  inline wxBitmap *GetBitmap(void) const { return (wxBitmap *) & m_buttonBitmap; }
+    wxBitmap *GetBitmap() const { return (wxBitmap *) & m_buttonBitmap; }

 #endif
 
 #endif
 

-  inline wxBitmap& GetBitmapLabel(void) const { return (wxBitmap&) m_buttonBitmap; }
-  inline wxBitmap& GetBitmapSelected(void) const { return (wxBitmap&) m_buttonBitmapSelected; }
-  inline wxBitmap& GetBitmapFocus(void) const { return (wxBitmap&) m_buttonBitmapFocus; }
-  inline wxBitmap& GetBitmapDisabled(void) const { return (wxBitmap&) m_buttonBitmapDisabled; }
-
-  inline void SetBitmapSelected(const wxBitmap& sel) { m_buttonBitmapSelected = sel; };
-  inline void SetBitmapFocus(const wxBitmap& focus) { m_buttonBitmapFocus = focus; };
-  inline void SetBitmapDisabled(const wxBitmap& disabled) { m_buttonBitmapDisabled = disabled; };
-
-  inline void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
-  inline int GetMarginX(void) { return m_marginX; }
-  inline int GetMarginY(void) { return m_marginY; }
-
-  // Implementation
-  virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
-  virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-  virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
-  virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
-
- protected:
-  wxBitmap m_buttonBitmap;
-  wxBitmap m_buttonBitmapSelected;
-  wxBitmap m_buttonBitmapFocus;
-  wxBitmap m_buttonBitmapDisabled;
-  int      m_marginX;
-  int      m_marginY;
+    wxBitmap& GetBitmapLabel() const { return (wxBitmap&) m_buttonBitmap; }
+    wxBitmap& GetBitmapSelected() const { return (wxBitmap&) m_buttonBitmapSelected; }
+    wxBitmap& GetBitmapFocus() const { return (wxBitmap&) m_buttonBitmapFocus; }
+    wxBitmap& GetBitmapDisabled() const { return (wxBitmap&) m_buttonBitmapDisabled; }
+
+    void SetBitmapSelected(const wxBitmap& sel) { m_buttonBitmapSelected = sel; };
+    void SetBitmapFocus(const wxBitmap& focus) { m_buttonBitmapFocus = focus; };
+    void SetBitmapDisabled(const wxBitmap& disabled) { m_buttonBitmapDisabled = disabled; };
+
+    void SetMargins(int x, int y) { m_marginX = x; m_marginY = y; }
+    int GetMarginX() const { return m_marginX; }
+    int GetMarginY() const { return m_marginY; }
+
+    // Implementation
+    virtual void SetDefault();
+    virtual bool MSWOnDraw(WXDRAWITEMSTRUCT *item);
+    virtual void DrawFace( WXHDC dc, int left, int top, int right, int bottom, bool sel );
+    virtual void DrawButtonFocus( WXHDC dc, int left, int top, int right, int bottom, bool sel );
+    virtual void DrawButtonDisable( WXHDC dc, int left, int top, int right, int bottom, bool with_marg );
+
+protected:
+    wxBitmap m_buttonBitmap;
+    wxBitmap m_buttonBitmapSelected;
+    wxBitmap m_buttonBitmapFocus;
+    wxBitmap m_buttonBitmapDisabled;
+    int      m_marginX;
+    int      m_marginY;

 };
 
 #endif
 };
 
 #endif

-    // __BMPBUTTNH__
+    // _WX_BMPBUTTN_H_