no changes, just remove #if'd out code

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

diff --git a/include/wx/motif/bmpbuttn.h b/include/wx/motif/bmpbuttn.h
index af3237a0dfad6cfb9456fc73aa287df510930d32..d923c768709851dc14d0605ac279901fd4191131 100644 (file)
--- a/include/wx/motif/bmpbuttn.h
+++ b/include/wx/motif/bmpbuttn.h
@@ -1,31 +1,27 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        bmpbuttn.h
+// Name:        wx/motif/bmpbuttn.h

 // Purpose:     wxBitmapButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxBitmapButton class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #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/motif/bmpmotif.h"
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 #include "wx/motif/bmpmotif.h"
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 

-class WXDLLEXPORT wxBitmapButton: public wxBitmapButtonBase
+class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase

 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 public:
     wxBitmapButton();
 {
     DECLARE_DYNAMIC_CLASS(wxBitmapButton)
 public:
     wxBitmapButton();

-    ~wxBitmapButton();
+    virtual ~wxBitmapButton();

     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
     wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,


@@ -34,13 +30,13 @@ public:
     {
         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,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxButtonNameStr);
     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 SetLabel(const wxBitmap& bitmap)
     {
         SetBitmapLabel(bitmap);


@@ -49,23 +45,23 @@ public:
     {
         wxControl::SetLabel(label);
     }
     {
         wxControl::SetLabel(label);
     }

-    
+

     virtual void SetBitmapLabel(const wxBitmap& bitmap);
     virtual void SetBitmapLabel(const wxBitmap& bitmap);

-    
+

     void SetBitmapSelected(const wxBitmap& sel);
     void SetBitmapFocus(const wxBitmap& focus);
     void SetBitmapDisabled(const wxBitmap& disabled);
     void SetBitmapSelected(const wxBitmap& sel);
     void SetBitmapFocus(const wxBitmap& focus);
     void SetBitmapDisabled(const wxBitmap& disabled);

-    
+

     // Implementation
     void DoSetBitmap();
     virtual void ChangeBackgroundColour();
     virtual wxSize DoGetBestSize() const;
     // Implementation
     void DoSetBitmap();
     virtual void ChangeBackgroundColour();
     virtual wxSize DoGetBestSize() const;

-    
+

 protected:
     wxBitmap m_bmpNormalOriginal; // May be different from m_buttonBitmap
     // if m_buttonBitmap has been changed
     // to reflect button background colour
 protected:
     wxBitmap m_bmpNormalOriginal; // May be different from m_buttonBitmap
     // if m_buttonBitmap has been changed
     // to reflect button background colour

-    wxBitmap m_bmpSelectedOriginal;   
+    wxBitmap m_bmpSelectedOriginal;

     wxBitmap m_bmpDisabledOriginal;
 
     wxBitmapCache m_bitmapCache;
     wxBitmap m_bmpDisabledOriginal;
 
     wxBitmapCache m_bitmapCache;