Make wxMDIParentFrame a regular top level window

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

diff --git a/include/wx/mac/bmpbuttn.h b/include/wx/mac/bmpbuttn.h
index f117362ec940e39dc072d46e35abb32686ee8e29..a9da7192416140f8c219254dda33ca27566355ad 100644 (file)
--- a/include/wx/mac/bmpbuttn.h
+++ b/include/wx/mac/bmpbuttn.h
@@ -1,24 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        bmpbuttn.h
 // Purpose:     wxBitmapButton class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        bmpbuttn.h
 // Purpose:     wxBitmapButton class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BMPBUTTN_H_
 #define _WX_BMPBUTTN_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "bmpbuttn.h"
 #endif
 
 #include "wx/button.h"
 
 #pragma interface "bmpbuttn.h"
 #endif
 
 #include "wx/button.h"
 

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

 
 #define wxDEFAULT_BUTTON_MARGIN 4
 
 
 #define wxDEFAULT_BUTTON_MARGIN 4