always declare wxAppInitializerFunction() as returning wxApp, whether we use gcc...

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

diff --git a/include/wx/button.h b/include/wx/button.h
index 30183940654fd8d0ec8f77596bb11b85a7a0f673..1fc1859a306228c0b06be0de8b99afbc7d64cf0d 100644 (file)
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -18,9 +18,11 @@
 // wxButton flags
 // ----------------------------------------------------------------------------
 
-// all these flags are obsolete
+// These two flags are obsolete
 #define wxBU_NOAUTODRAW      0x0000
 #define wxBU_AUTODRAW        0x0004
+
+// These flags affect label alignment
 #define wxBU_LEFT            0x0040
 #define wxBU_TOP             0x0080
 #define wxBU_RIGHT           0x0100
@@ -45,10 +47,10 @@ class WXDLLEXPORT wxButtonBase : public wxControl
 {
 public:
     // show the image in the button in addition to the label
-    virtual void SetImageLabel(const wxBitmap& bitmap) { }
+    virtual void SetImageLabel(const wxBitmap& WXUNUSED(bitmap)) { }
 
     // set the margins around the image
-    virtual void SetImageMargins(wxCoord x, wxCoord y) { }
+    virtual void SetImageMargins(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { }
 
     // this wxButton method is called when the button becomes the default one
     // on its panel
@@ -66,8 +68,6 @@ public:
     #include "wx/motif/button.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/button.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/button.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/button.h"
 #elif defined(__WXPM__)