fix focus problems in picker controls under MSW which were due to not letting the...

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 9b35bfe8504c69ce33b15dad6b936f479aa1d517..e6fc7d7314a93455d35a7d1e4a1c812e9451a97e 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -1,26 +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

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


@@ -42,7 +40,6 @@
     #define wxHAS_3STATE 0
 #endif
 
     #define wxHAS_3STATE 0
 #endif
 

-

 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,


@@ -60,10 +57,10 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
                                    name ) )
         return false;
     if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
                                    name ) )
         return false;

+    PreCreation();
+
+    wxXmString text( GetLabelText(label) );

 
 

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

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


@@ -77,17 +74,17 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
         XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,
 #endif
         NULL);
         XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,
 #endif
         NULL);

-    
+

     XtAddCallback( (Widget)m_mainWidget,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );
 
     XmToggleButtonSetState ((Widget) m_mainWidget, False, True);
 
     XtAddCallback( (Widget)m_mainWidget,
                    XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
                    (XtPointer)this );
 
     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;
 }
 


@@ -143,6 +140,9 @@ 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,
         (wxColour*) NULL);
 
     wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
         (wxColour*) NULL);
 


@@ -153,13 +153,14 @@ 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)
 }
 
 void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)


@@ -182,7 +183,7 @@ void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
                    NULL );
 #else
     XmToggleButtonSetState ((Widget) m_mainWidget,
                    NULL );
 #else
     XmToggleButtonSetState ((Widget) m_mainWidget,

-                            (Boolean) state == wxCHK_CHECKED, True);
+                            state == wxCHK_CHECKED, True);

 #endif
 
     m_inSetValue = false;
 #endif
 
     m_inSetValue = false;


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

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