X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51596bcb982d1147c00f869acf18062ca150fa91..22026088535d0c7dafaae15133a8d1078195a366:/src/msw/button.cpp

diff --git a/src/msw/button.cpp b/src/msw/button.cpp
index 4e93fe7cd8..3f5cd007c8 100644
--- 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,12 +51,15 @@ IMPLEMENT_DYNAMIC_CLASS_XTI(wxButton, wxControl,"wx/button.h")
 
 WX_BEGIN_PROPERTIES_TABLE(wxButton)
 	WX_DELEGATE( OnClick , wxEVT_COMMAND_BUTTON_CLICKED , wxCommandEvent )
+
+	WX_PROPERTY( Font , wxFont , SetFont , GetWindowFont  , )
+	WX_PROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") )
 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