OSX adaptions

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 519d0b7ffefd0cfadffbedf4c08fb4be038132b0..71dbee41de6affee7fe7e5f6d9c8b0f04c298149 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zetlin
 // Modified by:
 // Created:     15.08.00
-// RCS-ID:      $Id$
 // Copyright:   (c) Vadim Zetlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,38 +13,9 @@
 
 #include "wx/defs.h"
 
-// ----------------------------------------------------------------------------
-// wxButton flags shared with other classes
-// ----------------------------------------------------------------------------
-
-#if wxUSE_TOGGLEBTN || wxUSE_BUTTON
-
-// These flags affect label alignment
-#define wxBU_LEFT            0x0040
-#define wxBU_TOP             0x0080
-#define wxBU_RIGHT           0x0100
-#define wxBU_BOTTOM          0x0200
-#define wxBU_ALIGN_MASK      ( wxBU_LEFT | wxBU_TOP | wxBU_RIGHT | wxBU_BOTTOM )
-#endif
-
 #if wxUSE_BUTTON
 
-// ----------------------------------------------------------------------------
-// wxButton specific flags
-// ----------------------------------------------------------------------------
-
-// These two flags are obsolete
-#define wxBU_NOAUTODRAW      0x0000
-#define wxBU_AUTODRAW        0x0004
-
-// by default, the buttons will be created with some (system dependent)
-// minimal size to make them look nicer, giving this style will make them as
-// small as possible
-#define wxBU_EXACTFIT        0x0001
-
-#include "wx/control.h"
-
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
+#include "wx/anybutton.h"
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
 
@@ -53,35 +23,27 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxButtonNameStr[];
 // wxButton: a push button
 // ----------------------------------------------------------------------------
 
-class WXDLLIMPEXP_CORE wxButtonBase : public wxControl
+class WXDLLIMPEXP_CORE wxButtonBase : public wxAnyButton
 {
 public:
     wxButtonBase() { }
 
-    // show the image in the button in addition to the label
-    virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
-
-    // set the margins around the image
-    virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { }
+    // show the authentication needed symbol on the button: this is currently
+    // only implemented on Windows Vista and newer (on which it shows the UAC
+    // shield symbol)
+    void SetAuthNeeded(bool show = true) { DoSetAuthNeeded(show); }
+    bool GetAuthNeeded() const { return DoGetAuthNeeded(); }
 
     // make this button the default button in its top level window
     //
     // returns the old default item (possibly NULL)
     virtual wxWindow *SetDefault();
 
-    // Buttons on MSW can look bad if they are not native colours, because
-    // then they become owner-drawn and not theme-drawn.  Disable it here
-    // in wxButtonBase to make it consistent.
-    virtual bool ShouldInheritColours() const { return false; }
-
     // returns the default button size for this platform
     static wxSize GetDefaultSize();
 
 protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    DECLARE_NO_COPY_CLASS(wxButtonBase)
+    wxDECLARE_NO_COPY_CLASS(wxButtonBase);
 };
 
 #if defined(__WXUNIVERSAL__)
@@ -100,11 +62,8 @@ protected:
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
     #include "wx/os2/button.h"
-#elif defined(__WXPALMOS__)
-    #include "wx/palmos/button.h"
 #endif
 
 #endif // wxUSE_BUTTON
 
-#endif
-    // _WX_BUTTON_H_BASE_
+#endif // _WX_BUTTON_H_BASE_