X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/61a83c1c503c5c8e9840d82e4f45dd50979ff358..7b70a3257f24daa4d574afd03c82e65631af1f2b:/src/univ/button.cpp?ds=sidebyside diff --git a/src/univ/button.cpp b/src/univ/button.cpp index 5d4410bbd2..fb7914d2a1 100644 --- a/src/univ/button.cpp +++ b/src/univ/button.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "univbutton.h" #endif @@ -82,7 +82,7 @@ bool wxButton::Create(wxWindow *parent, style |= wxALIGN_CENTRE_HORIZONTAL | wxALIGN_CENTRE_VERTICAL; } - if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) ) + if ( !wxControl::Create(parent, id, pos, size, style, validator, name) ) return FALSE; SetLabel(label); @@ -395,8 +395,8 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer, return wxStdInputHandler::HandleMouseMove(consumer, event); } -bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer *consumer, - const wxFocusEvent& event) +bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer * WXUNUSED(consumer), + const wxFocusEvent& WXUNUSED(event)) { // buttons change appearance when they get/lose focus, so return TRUE to // refresh @@ -404,7 +404,7 @@ bool wxStdButtonInputHandler::HandleFocus(wxInputConsumer *consumer, } bool wxStdButtonInputHandler::HandleActivation(wxInputConsumer *consumer, - bool activated) + bool WXUNUSED(activated)) { // the default button changes appearance when the app is [de]activated, so // return TRUE to refresh