fixed compilation in Unicode build

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 0c59e67684130ad59e42212148a06262cc4d324c..613052ef21390c4878da7ca44dce3cbcda5ccdf8 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -13,35 +13,47 @@
 #pragma implementation "checkbox.h"
 #endif
 
 #pragma implementation "checkbox.h"
 #endif
 

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

 #include "wx/checkbox.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,
 
 #include "wx/motif/private.h"
 
 void wxCheckBoxCallback (Widget w, XtPointer clientData,

-                   XtPointer ptr);
+                         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,

-           const wxPoint& pos,
-           const wxSize& size, long style,
-           const wxValidator& validator,
-           const wxString& name)
+                        const wxPoint& pos,
+                        const wxSize& size, long style,
+                        const wxValidator& validator,
+                        const wxString& name)

 {
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();
 {
     SetName(name);
     SetValidator(validator);
     m_windowStyle = style;
     m_backgroundColour = parent->GetBackgroundColour();
     m_foregroundColour = parent->GetForegroundColour();

+    m_font = parent->GetFont();

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


@@ -50,19 +62,28 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     else
         m_windowId = id;
 
     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();
     Widget parentWidget = (Widget) parent->GetClientWidget();

+    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));

 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
 
     m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",

-                                xmToggleButtonWidgetClass, parentWidget,
-                                XmNlabelString, text,
-                                NULL);
+        xmToggleButtonWidgetClass, parentWidget,
+        XmNfontList, fontList,
+        XmNlabelString, text(),
+        NULL);
+#if 0    

     XmStringFree (text);
     XmStringFree (text);

-
+#endif
+    

     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
     XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,

-                (XtPointer) this);
+        (XtPointer) this);

 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 
 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 


@@ -70,8 +91,6 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();

-    SetFont(* parent->GetFont());
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -94,11 +113,11 @@ 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,
-           const wxValidator& validator,
-           const wxString& name)
+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);
 {
     SetName(name);
     SetValidator(validator);


@@ -116,17 +135,17 @@ bool wxBitmapCheckBox::Create(wxWindow *parent, wxWindowID id, const wxBitmap *l
     return FALSE;
 }
 
     return FALSE;
 }
 

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

 {
     // TODO
 }
 
 {
     // TODO
 }
 

-void wxBitmapCheckBox::SetSize(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
 }


@@ -137,40 +156,45 @@ 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;
-    
-  wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
-  event.SetInt((int) item->GetValue ());
-  event.SetEventObject(item);
-  item->ProcessCommand (event);
+    if (item->InSetValue())
+        return;
+
+    wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
+    event.SetInt((int) item->GetValue ());
+    event.SetEventObject(item);
+    item->ProcessCommand (event);

 }
 
 }
 

-void wxCheckBox::ChangeFont()
+void wxCheckBox::ChangeFont(bool keepOriginalSize)

 {
 {

-    wxWindow::ChangeFont();
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxCheckBox::ChangeBackgroundColour()
 {
 }
 
 void wxCheckBox::ChangeBackgroundColour()
 {

-  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,
-                  XmNselectColor, g_itemColors[wxSELE_INDEX].pixel,
-               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);
+
+    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+
+    // Better to have the checkbox selection in black, or it's
+    // hard to determine what state it is in.
+    XtVaSetValues ((Widget) m_mainWidget,
+   //        XmNselectColor, g_itemColors[wxSELE_INDEX].pixel,
+           XmNselectColor, selectPixel,
+        NULL);

 }
 
 void wxCheckBox::ChangeForegroundColour()
 }
 
 void wxCheckBox::ChangeForegroundColour()