VisualAge C++ V4.0 configuration files

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 1641f1077cbc65a52b5d50b3eb33b3df9c017347..8018173cc2b46fe64ce6652ea27bddda75f7aa6c 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -43,36 +43,42 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     m_windowStyle = style;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     m_windowStyle = style;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();

-    m_windowFont = parent->GetFont();
-    
+    m_font = parent->GetFont();
+

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-    
+

     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;
     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;

-    
+
+#if 0  // gcc 2.95 doesn't like this apparently    

     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
     char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);

-    

     XmString text = XmStringCreateSimple (label1);
     XmString text = XmStringCreateSimple (label1);

-    Widget parentWidget = (Widget) parent->GetClientWidget();
-    XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
+#endif
+
+    wxXmString text( label );

     
     

+    Widget parentWidget = (Widget) parent->GetClientWidget();
+    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
+

     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,
         XmNfontList, fontList,
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
         xmToggleButtonWidgetClass, parentWidget,
         XmNfontList, fontList,

-        XmNlabelString, text,
+        XmNlabelString, text(),

         NULL);
         NULL);

+#if 0    

     XmStringFree (text);
     XmStringFree (text);

+#endif

     
     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);

-    
+

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

-    
+

     ChangeBackgroundColour();
     return TRUE;
 }
     ChangeBackgroundColour();
     return TRUE;
 }


@@ -105,16 +111,16 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;

-    
+

     if (parent) parent->AddChild(this);
     if (parent) parent->AddChild(this);

-    
+

     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;
     if ( id == -1 )
         m_windowId = NewControlId();
     else
         m_windowId = id;

-    
+

     // TODO: Create the bitmap checkbox
     // TODO: Create the bitmap checkbox

-    
+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -123,7 +129,7 @@ void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
     // TODO
 }
 
     // TODO
 }
 

-void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxBitmapCheckBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)

 {
     // TODO
 }
 {
     // TODO
 }


@@ -143,10 +149,10 @@ void wxCheckBoxCallback (Widget w, XtPointer clientData,
                          XtPointer ptr)
 {
     wxCheckBox *item = (wxCheckBox *) clientData;
                          XtPointer ptr)
 {
     wxCheckBox *item = (wxCheckBox *) clientData;

-    
+

     if (item->InSetValue())
         return;
     if (item->InSetValue())
         return;

-    
+

     wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
     event.SetInt((int) item->GetValue ());
     event.SetEventObject(item);
     wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
     event.SetInt((int) item->GetValue ());
     event.SetEventObject(item);


@@ -162,14 +168,14 @@ void wxCheckBox::ChangeBackgroundColour()
 {
     wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
         (wxColour*) NULL);
 {
     wxComputeColours (XtDisplay((Widget) m_mainWidget), & m_backgroundColour,
         (wxColour*) NULL);

-    
+

     XtVaSetValues ((Widget) m_mainWidget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
         XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
         XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);
     XtVaSetValues ((Widget) m_mainWidget,
         XmNbackground, g_itemColors[wxBACK_INDEX].pixel,
         XmNtopShadowColor, g_itemColors[wxTOPS_INDEX].pixel,
         XmNbottomShadowColor, g_itemColors[wxBOTS_INDEX].pixel,
         XmNforeground, g_itemColors[wxFORE_INDEX].pixel,
         NULL);

-    
+

     int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
 
     // Better to have the checkbox selection in black, or it's
     int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
 
     // Better to have the checkbox selection in black, or it's