Added files for wxNotebook and wxCocoaNSTabView

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

diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp
index c15ebca4bab3c657d6dfbc55170643ca6310cf6e..e80d036343707c130a76773718447049813f9521 100644 (file)
--- a/src/univ/checkbox.cpp
+++ b/src/univ/checkbox.cpp
@@ -6,7 +6,7 @@
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Created:     25.08.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "univcheckbox.h"
 #endif
 
     #pragma implementation "univcheckbox.h"
 #endif
 


@@ -67,11 +67,9 @@ bool wxCheckBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString &name)
 {
                         const wxValidator& validator,
                         const wxString &name)
 {

-    if ( !wxControl::Create(parent, id, pos, size, style, wxDefaultValidator, name) )
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )

         return FALSE;
 
         return FALSE;
 

-    m_hasDialogBackground = TRUE;
-

     SetLabel(label);
     SetBestSize(size);
 
     SetLabel(label);
     SetBestSize(size);
 


@@ -281,7 +279,7 @@ wxStdCheckboxInputHandler::wxStdCheckboxInputHandler(wxInputHandler *inphand)
 }
 
 bool wxStdCheckboxInputHandler::HandleActivation(wxInputConsumer *consumer,
 }
 
 bool wxStdCheckboxInputHandler::HandleActivation(wxInputConsumer *consumer,

-                                                 bool activated)
+                                                 bool WXUNUSED(activated))

 {
     // only the focused checkbox appearance changes when the app gains/loses
     // activation
 {
     // only the focused checkbox appearance changes when the app gains/loses
     // activation