Changed wxFont, wxPen, wxBrush to not implicitly use the wxTheXXXList

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 160e3a6c81b861edf81804e5a4488e1e705e48e8..f6226acfd4827bcf1e698a20f734dda2bf8fd443 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -13,23 +13,31 @@
 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+

 #include "wx/checkbox.h"
 #include "wx/utils.h"
 
 #include "wx/checkbox.h"
 #include "wx/utils.h"
 

+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif

 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>
 #include <Xm/ToggleB.h>
 #include <Xm/ToggleBG.h>

+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif

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

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)
 IMPLEMENT_DYNAMIC_CLASS(wxCheckBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapCheckBox, wxCheckBox)

-#endif

 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
 // Single check box item
 bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,


@@ -44,35 +52,42 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     m_font = parent->GetFont();
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
     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);

+#endif
+    wxString label1(wxStripMenuCodes(label));
+
+    wxXmString text( label1 );
+    

     Widget parentWidget = (Widget) parent->GetClientWidget();
     XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
     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;
 }


@@ -96,39 +111,39 @@ void wxCheckBox::Command (wxCommandEvent & event)
 }
 
 // Bitmap checkbox
 }
 
 // Bitmap checkbox

-bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-                              const wxPoint& pos,
-                              const wxSize& size, long style,
+bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *WXUNUSED(label),
+                              const wxPoint& WXUNUSED(pos),
+                              const wxSize& WXUNUSED(size), long style,

                               const wxValidator& validator,
                               const wxString& name)
 {
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;
                               const wxValidator& validator,
                               const wxString& name)
 {
     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;
 }
 

-void wxBitmapCheckBox::SetLabel(const wxBitmap& bitmap)
+void wxBitmapCheckBox::SetLabel(const wxBitmap& WXUNUSED(bitmap))

 {
     // TODO
 }
 
 {
     // TODO
 }
 

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

 {
     // TODO
 }
 
 {
     // TODO
 }
 

-void wxBitmapCheckBox::SetValue(bool val)
+void wxBitmapCheckBox::SetValue(bool WXUNUSED(val))

 {
     // TODO
 }
 {
     // TODO
 }


@@ -139,14 +154,14 @@ bool wxBitmapCheckBox::GetValue() const
     return FALSE;
 }
 
     return FALSE;
 }
 

-void wxCheckBoxCallback (Widget w, XtPointer clientData,
-                         XtPointer ptr)
+void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
+                         XtPointer WXUNUSED(ptr))

 {
     wxCheckBox *item = (wxCheckBox *) clientData;
 {
     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 +177,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