don't call SelectObject() twice in SetBrush() nor SetFont() neither

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

diff --git a/src/univ/button.cpp b/src/univ/button.cpp
index 5d4410bbd24308495d08ae109606149537d77956..fb7914d2a157c6bfe223b7503af937a7e36e2782 100644 (file)
--- a/src/univ/button.cpp
+++ b/src/univ/button.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "univbutton.h"
 #endif
 
     #pragma implementation "univbutton.h"
 #endif
 


@@ -82,7 +82,7 @@ bool wxButton::Create(wxWindow *parent,
         style |= wxALIGN_CENTRE_HORIZONTAL | wxALIGN_CENTRE_VERTICAL;
     }
 
         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);
         return FALSE;
 
     SetLabel(label);


@@ -395,8 +395,8 @@ bool wxStdButtonInputHandler::HandleMouseMove(wxInputConsumer *consumer,
     return wxStdInputHandler::HandleMouseMove(consumer, event);
 }
 
     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
 {
     // 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 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
 {
     // the default button changes appearance when the app is [de]activated, so
     // return TRUE to refresh