fixes for stock items not known to some GTK+ versions

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

diff --git a/src/univ/checkbox.cpp b/src/univ/checkbox.cpp
index c15ebca4bab3c657d6dfbc55170643ca6310cf6e..450d303dc1f343c111b34892a423778875956061 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
 


@@ -54,7 +54,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 
 void wxCheckBox::Init()
 {
 
 void wxCheckBox::Init()
 {

-    m_isPressed = FALSE;
+    m_isPressed = false;

     m_status = Status_Unchecked;
 }
 
     m_status = Status_Unchecked;
 }
 


@@ -67,17 +67,15 @@ 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) )
-        return FALSE;
-
-    m_hasDialogBackground = TRUE;
+    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
+        return false;

 
     SetLabel(label);
     SetBestSize(size);
 
     CreateInputHandler(wxINP_HANDLER_CHECKBOX);
 
 
     SetLabel(label);
     SetBestSize(size);
 
     CreateInputHandler(wxINP_HANDLER_CHECKBOX);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -209,7 +207,7 @@ void wxCheckBox::Press()
 {
     if ( !m_isPressed )
     {
 {
     if ( !m_isPressed )
     {

-        m_isPressed = TRUE;
+        m_isPressed = true;

 
         Refresh();
     }
 
         Refresh();
     }


@@ -219,7 +217,7 @@ void wxCheckBox::Release()
 {
     if ( m_isPressed )
     {
 {
     if ( m_isPressed )
     {

-        m_isPressed = FALSE;
+        m_isPressed = false;

 
         Refresh();
     }
 
         Refresh();
     }


@@ -227,7 +225,7 @@ void wxCheckBox::Release()
 
 void wxCheckBox::Toggle()
 {
 
 void wxCheckBox::Toggle()
 {

-    m_isPressed = FALSE;
+    m_isPressed = false;

 
     ChangeValue(!GetValue());
 }
 
     ChangeValue(!GetValue());
 }


@@ -260,15 +258,15 @@ bool wxCheckBox::PerformAction(const wxControlAction& action,
     else if ( action == wxACTION_BUTTON_RELEASE )
         Release();
     if ( action == wxACTION_CHECKBOX_CHECK )
     else if ( action == wxACTION_BUTTON_RELEASE )
         Release();
     if ( action == wxACTION_CHECKBOX_CHECK )

-        ChangeValue(TRUE);
+        ChangeValue(true);

     else if ( action == wxACTION_CHECKBOX_CLEAR )
     else if ( action == wxACTION_CHECKBOX_CLEAR )

-        ChangeValue(FALSE);
+        ChangeValue(false);

     else if ( action == wxACTION_CHECKBOX_TOGGLE )
         Toggle();
     else
         return wxControl::PerformAction(action, numArg, strArg);
 
     else if ( action == wxACTION_CHECKBOX_TOGGLE )
         Toggle();
     else
         return wxControl::PerformAction(action, numArg, strArg);
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -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