applying patch, fixes #10523

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index c9c180cc930f429f5bf92eb0aadcffcd661760a1..1a79bf75ec76879fe5d44f4dfa1a62156d119059 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -1,30 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        checkbox.cpp
+// Name:        src/motif/checkbox.cpp

 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     wxCheckBox
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checkbox.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
+#include "wx/checkbox.h"

 
 

-#include "wx/defs.h"
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+#endif

 
 

-#include "wx/checkbox.h"

 #include "wx/tglbtn.h"
 #include "wx/tglbtn.h"

-#include "wx/utils.h"

 
 #ifdef __VMS__
 #pragma message disable nosimpint
 
 #ifdef __VMS__
 #pragma message disable nosimpint


@@ -39,6 +33,15 @@
 
 #include "wx/motif/private.h"
 
 
 #include "wx/motif/private.h"
 

+// define symbols that are missing in old versions of Motif.
+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+    #define wxHAS_3STATE 1
+#else
+    #define wxHAS_3STATE 0
+#endif
+
+#include "wx/motif/private.h"
+

 void wxCheckBoxCallback (Widget w, XtPointer clientData,
                          XtPointer ptr);
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
                          XtPointer ptr);
 


@@ -53,34 +56,36 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
                                    name ) )
 {
     if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
                                    name ) )

-        return FALSE;
+        return false;
+    PreCreation();
+
+    wxXmString text( GetLabelText(label) );

 
 

-    wxString label1(wxStripMenuCodes(label));
-    wxXmString text( label1 );
-    

     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,
     Widget parentWidget = (Widget) parent->GetClientWidget();
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,

-        wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
+        wxFont::GetFontTag(), m_font.GetFontTypeC(XtDisplay(parentWidget)),

         XmNlabelString, text(),
         XmNrecomputeSize, False,
         // XmNindicatorOn, XmINDICATOR_CHECK_BOX,
         // XmNfillOnSelect, False,
         XmNlabelString, text(),
         XmNrecomputeSize, False,
         // XmNindicatorOn, XmINDICATOR_CHECK_BOX,
         // XmNfillOnSelect, False,

+#if wxHAS_3STATE

         XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,
         XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,

+#endif

         NULL);
         NULL);

-    
+

     XtAddCallback( (Widget)m_mainWidget,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );
 
     XtAddCallback( (Widget)m_mainWidget,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );
 

-    XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
+    XmToggleButtonSetState ((Widget) m_mainWidget, False, True);

 
 

+    PostCreation();

     AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
                   pos.x, pos.y, size.x, size.y );
 
     AttachWidget( parent, m_mainWidget, (WXWidget)NULL,
                   pos.x, pos.y, size.x, size.y );
 

-    ChangeBackgroundColour();
-    return TRUE;
+    return true;

 }
 
 void wxCheckBox::SetValue(bool val)
 }
 
 void wxCheckBox::SetValue(bool val)


@@ -135,8 +140,11 @@ void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
 
 void wxCheckBox::ChangeBackgroundColour()
 {
 
 void wxCheckBox::ChangeBackgroundColour()
 {

+    if (!m_backgroundColour.Ok())
+        return;
+

     wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
     wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,

-        (wxColour*) NULL);
+        NULL);

 
     XtVaSetValues ((Widget) m_mainWidget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
 
     XtVaSetValues ((Widget) m_mainWidget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,


@@ -145,19 +153,21 @@ void wxCheckBox::ChangeBackgroundColour()
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);
 
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);
 

-    int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));
+    wxColour colour = *wxBLACK;
+    WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));

 
     // Better to have the checkbox selection in black, or it's
     // hard to determine what state it is in.
     XtVaSetValues ((Widget) m_mainWidget,
            XmNselectColor, selectPixel,
 
     // Better to have the checkbox selection in black, or it's
     // hard to determine what state it is in.
     XtVaSetValues ((Widget) m_mainWidget,
            XmNselectColor, selectPixel,

-        NULL);
+           NULL);

 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
     m_inSetValue = true;
 
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
 {
     m_inSetValue = true;
 

+#if wxHAS_3STATE

     unsigned char value;
 
     switch (state)
     unsigned char value;
 
     switch (state)


@@ -165,17 +175,23 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
     case wxCHK_UNCHECKED: value = XmUNSET; break;
     case wxCHK_CHECKED: value = XmSET; break;
     case wxCHK_UNDETERMINED: value = XmINDETERMINATE; break;
     case wxCHK_UNCHECKED: value = XmUNSET; break;
     case wxCHK_CHECKED: value = XmSET; break;
     case wxCHK_UNDETERMINED: value = XmINDETERMINATE; break;

+    default: wxASSERT(0); return;

     }
 
     XtVaSetValues( (Widget) m_mainWidget,
                    XmNset, value,
                    NULL );
     }
 
     XtVaSetValues( (Widget) m_mainWidget,
                    XmNset, value,
                    NULL );

+#else
+    XmToggleButtonSetState ((Widget) m_mainWidget,
+                            state == wxCHK_CHECKED, True);
+#endif

 
     m_inSetValue = false;
 }
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {
 
     m_inSetValue = false;
 }
 
 wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 {

+#if wxHAS_3STATE

     unsigned char value = 0;
 
     XtVaGetValues( (Widget) m_mainWidget,
     unsigned char value = 0;
 
     XtVaGetValues( (Widget) m_mainWidget,


@@ -191,6 +207,9 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 
     // impossible...
     return wxCHK_UNDETERMINED;
 
     // impossible...
     return wxCHK_UNDETERMINED;

+#else
+    return wxCheckBoxState(XmToggleButtonGetState ((Widget) m_mainWidget));
+#endif

 }
 
 ///////////////////////////////////////////////////////////////////////////////
 }
 
 ///////////////////////////////////////////////////////////////////////////////


@@ -199,7 +218,7 @@ wxCheckBoxState wxCheckBox::DoGet3StateValue() const
 
 #if wxUSE_TOGGLEBTN
 
 
 #if wxUSE_TOGGLEBTN
 

-DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+wxDEFINE_EVENT( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEvent );

 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 
 bool wxToggleButton::Create( wxWindow* parent, wxWindowID id,
 IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
 
 bool wxToggleButton::Create( wxWindow* parent, wxWindowID id,


@@ -234,4 +253,4 @@ bool wxToggleButton::Create( wxWindow* parent, wxWindowID id,
     return true;
 }
 
     return true;
 }
 

-#endif // wxUSE_TOGGLEBUTTON
+#endif // wxUSE_TOGGLEBTN