Removed erroneous return statements

[wxWidgets.git] / src / msw / button.cpp

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 34b8445f006632c36b82d395e7f23c3131adede0..4510a0337e9858a64ffb196d8f64aad1b598c8d7 100644 (file)
--- a/src/msw/button.cpp
+++ b/src/msw/button.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "button.h"
 #endif
 
@@ -51,13 +51,15 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxButton)
        WX_DELEGATE( OnClick , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent )
-       // default
+
+       WX_PROPERTY( Font , wxFont , SetFont , GetFont  , )
+       WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
 WX_END_PROPERTIES_TABLE()
 
 WX_BEGIN_HANDLERS_TABLE(wxButton)
 WX_END_HANDLERS_TABLE()
 
-WX_CONSTRUCTOR_5( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Title , wxPoint , Position , wxSize , Size ) 
+WX_CONSTRUCTOR_6( wxButton , wxWindow* , Parent , wxWindowID , Id , wxString , Label , wxPoint , Position , wxSize , Size , long , WindowStyle  )
 
 
 #else