wxDIB::Create(wxBitmap) shouldn't do any conversions if the bitmap is already a DIB...

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

diff --git a/include/wx/mac/button.h b/include/wx/mac/button.h
index b016c98338de7ff57889a4d999ee674607093cea..f400b6da20e54d4eaf44bbb35986ba6506a39fbd 100644 (file)
--- a/include/wx/mac/button.h
+++ b/include/wx/mac/button.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.h
 // Purpose:     wxButton class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        button.h
 // Purpose:     wxButton 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_BUTTON_H_
 #define _WX_BUTTON_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 #define _WX_BUTTON_H_
 

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

 #pragma interface "button.h"
 #endif
 
 #pragma interface "button.h"
 #endif
 


@@ -22,7 +22,7 @@
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton

-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase

 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
 {
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:


@@ -42,7 +42,7 @@ class WXDLLEXPORT wxButton: public wxControl
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 

-       virtual void MacHandleControlClick( ControlHandle control , SInt16 controlpart ) ;
+    virtual void MacHandleControlClick( WXWidget control , short controlpart ) ;

     static wxSize GetDefaultSize();
 
   virtual void SetDefault();
     static wxSize GetDefaultSize();
 
   virtual void SetDefault();