#pragma implementation "checkbox.h"
#endif
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
#include "wx/checkbox.h"
+#include "wx/tglbtn.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>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
#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)
-#endif
// 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();
- m_windowFont = parent->GetFont();
-
- if (parent) parent->AddChild(this);
-
- if ( id == -1 )
- m_windowId = NewControlId();
- else
- m_windowId = id;
-
- char* label1 = (label.IsNull() ? "" : (char*) (const char*) label);
+ if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
+ name ) )
+ return FALSE;
- XmString text = XmStringCreateSimple (label1);
+ wxString label1(wxStripMenuCodes(label));
+ wxXmString text( label1 );
+
Widget parentWidget = (Widget) parent->GetClientWidget();
- XmFontList fontList = (XmFontList) m_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
- xmToggleButtonWidgetClass, parentWidget,
- XmNfontList, fontList,
- XmNlabelString, text,
- NULL);
- XmStringFree (text);
-
- XtAddCallback ((Widget) m_mainWidget, XmNvalueChangedCallback, (XtCallbackProc) wxCheckBoxCallback,
- (XtPointer) this);
+ xmToggleButtonWidgetClass, parentWidget,
+ wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
+ XmNlabelString, text(),
+ XmNrecomputeSize, False,
+ NULL);
+
+ XtAddCallback( (Widget)m_mainWidget,
+ XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
+ (XtPointer)this );
XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
SetCanAddEventHandler(TRUE);
- 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;
ProcessCommand (event);
}
-// 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)
-{
- SetName(name);
- SetValidator(validator);
- m_windowStyle = style;
-
- if (parent) parent->AddChild(this);
-
- if ( id == -1 )
- m_windowId = NewControlId();
- else
- m_windowId = id;
-
- // TODO: Create the bitmap checkbox
-
- return FALSE;
-}
-
-void wxBitmapCheckBox::SetLabel(const wxBitmap *bitmap)
+void wxCheckBoxCallback (Widget WXUNUSED(w), XtPointer clientData,
+ XtPointer WXUNUSED(ptr))
{
- // TODO
-}
+ wxCheckBox *item = (wxCheckBox *) clientData;
-void wxBitmapCheckBox::SetSize(int x, int y, int width, int height, int sizeFlags)
-{
- // TODO
-}
+ if (item->InSetValue())
+ return;
-void wxBitmapCheckBox::SetValue(bool val)
-{
- // TODO
+ wxCommandEvent event (item->m_evtType, item->GetId());
+ event.SetInt((int) item->GetValue ());
+ event.SetEventObject(item);
+ item->ProcessCommand (event);
}
-bool wxBitmapCheckBox::GetValue() const
+void wxCheckBox::ChangeBackgroundColour()
{
- // TODOD
- return FALSE;
+ 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, selectPixel,
+ NULL);
}
-void wxCheckBoxCallback (Widget w, XtPointer clientData,
- XtPointer ptr)
-{
- wxCheckBox *item = (wxCheckBox *) clientData;
+///////////////////////////////////////////////////////////////////////////////
+// wxToggleButton
+///////////////////////////////////////////////////////////////////////////////
- if (item->InSetValue())
- return;
-
- wxCommandEvent event (wxEVT_COMMAND_CHECKBOX_CLICKED, item->GetId());
- event.SetInt((int) item->GetValue ());
- event.SetEventObject(item);
- item->ProcessCommand (event);
-}
+#if wxUSE_TOGGLEBTN
-void wxCheckBox::ChangeFont(bool keepOriginalSize)
-{
- wxWindow::ChangeFont(keepOriginalSize);
-}
+DEFINE_EVENT_TYPE(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED)
+IMPLEMENT_DYNAMIC_CLASS(wxToggleButton, wxControl)
-void wxCheckBox::ChangeBackgroundColour()
+bool wxToggleButton::Create( wxWindow* parent, wxWindowID id,
+ const wxString& label,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& val,
+ const wxString &name )
{
- 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);
+ if( !wxCheckBox::Create( parent, id, label, pos, size, style, val, name ) )
+ return false;
+
+ XtVaSetValues( (Widget)m_mainWidget,
+ XmNindicatorSize, 0,
+#if XmVersion >= 2000
+ XmNindicatorOn, XmINDICATOR_NONE,
+#else
+ XmNindicatorOn, False,
+#endif
+ XmNfillOnSelect, False,
+ XmNshadowThickness, 2,
+ XmNalignment, XmALIGNMENT_CENTER,
+ XmNmarginLeft, 0,
+ XmNmarginRight, 0,
+ NULL );
+
+ // set it again, because the XtVaSetValue above resets it
+ if( size.x != -1 || size.y != -1 )
+ SetSize( size );
+
+ return true;
}
-void wxCheckBox::ChangeForegroundColour()
-{
- wxWindow::ChangeForegroundColour();
-}
+#endif // wxUSE_TOGGLEBUTTON
projects / wxWidgets.git / blobdiff