avoid GCC warning about type-punned pointer breaking strict aliasing rules

[wxWidgets.git] / include / wx / mac / carbon / bmpbuttn.h

diff --git a/include/wx/mac/carbon/bmpbuttn.h b/include/wx/mac/carbon/bmpbuttn.h
index 28a91ed93f218e4c1d7f883ed4fa780cf5d03712..3e30334b32bb0cefe13d1593de0f88cac505bc0c 100644 (file)
--- a/include/wx/mac/carbon/bmpbuttn.h
+++ b/include/wx/mac/carbon/bmpbuttn.h
@@ -12,13 +12,9 @@
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "bmpbuttn.h"
-#endif
-
 #include "wx/button.h"
 
-WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr;
+WXDLLEXPORT_DATA(extern const char) wxButtonNameStr[];
 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
@@ -49,14 +45,6 @@ public:
 
     virtual void SetBitmapLabel(const wxBitmap& bitmap);
 
-/*
-  // TODO: 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:
     virtual wxSize DoGetBestSize() const;    
 };