projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix warnings about casting regmatch_t struct fields to size_t
[wxWidgets.git]
/
src
/
motif
/
checkbox.cpp
diff --git
a/src/motif/checkbox.cpp
b/src/motif/checkbox.cpp
index 7fa63cbd95e2b4c5510ab2b4f4a35ea5ec35fc58..9a274cc63a3a7909302374e2bbad4e5cc4220856 100644
(file)
--- a/
src/motif/checkbox.cpp
+++ b/
src/motif/checkbox.cpp
@@
-9,21
+9,11
@@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "checkbox.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __VMS
#define XtDisplay XTDISPLAY
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __VMS
#define XtDisplay XTDISPLAY
-#define XmNtoggleMode 0
-#define XmTOGGLE_INDETERMINATE 1
-#define XmTOGGLE_BOOLEAN 2
-#define XmUNSET 3
-#define XmSET 4
-#define XmINDETERMINATE 5
#endif
#include "wx/defs.h"
#endif
#include "wx/defs.h"
@@
-43,6
+33,16
@@
#pragma message enable nosimpint
#endif
#pragma message enable nosimpint
#endif
+#include "wx/motif/private.h"
+
+// define symbols that are missing in old versions of Motif.
+#if wxCHECK_MOTIF_VERSION( 2, 0 )
+ #define wxHAS_3STATE 1
+#else
+ #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,
@@
-59,7
+59,7
@@
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
{
if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
name ) )
{
if( !wxControl::CreateControl( parent, id, pos, size, style, validator,
name ) )
- return
FALSE
;
+ return
false
;
wxString label1(wxStripMenuCodes(label));
wxXmString text( label1 );
wxString label1(wxStripMenuCodes(label));
wxXmString text( label1 );
@@
-68,25
+68,27
@@
bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
xmToggleButtonWidgetClass, parentWidget,
m_mainWidget = (WXWidget) XtVaCreateManagedWidget ("toggle",
xmToggleButtonWidgetClass, parentWidget,
- wxFont::GetFontTag(), m_font.GetFontType(XtDisplay(parentWidget)),
+ wxFont::GetFontTag(), m_font.GetFontType
C
(XtDisplay(parentWidget)),
XmNlabelString, text(),
XmNrecomputeSize, False,
// XmNindicatorOn, XmINDICATOR_CHECK_BOX,
// XmNfillOnSelect, False,
XmNlabelString, text(),
XmNrecomputeSize, False,
// XmNindicatorOn, XmINDICATOR_CHECK_BOX,
// XmNfillOnSelect, False,
+#if wxHAS_3STATE
XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,
XmNtoggleMode, Is3State() ? XmTOGGLE_INDETERMINATE : XmTOGGLE_BOOLEAN,
+#endif
NULL);
XtAddCallback( (Widget)m_mainWidget,
XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
(XtPointer)this );
NULL);
XtAddCallback( (Widget)m_mainWidget,
XmNvalueChangedCallback, (XtCallbackProc)wxCheckBoxCallback,
(XtPointer)this );
- XmToggleButtonSetState ((Widget) m_mainWidget, F
ALSE, TRUE
);
+ XmToggleButtonSetState ((Widget) m_mainWidget, F
alse, True
);
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();
- return
TRUE
;
+ return
true
;
}
void wxCheckBox::SetValue(bool val)
}
void wxCheckBox::SetValue(bool val)
@@
-164,6
+166,7
@@
void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
{
m_inSetValue = true;
{
m_inSetValue = true;
+#if wxHAS_3STATE
unsigned char value;
switch (state)
unsigned char value;
switch (state)
@@
-177,12
+180,17
@@
void wxCheckBox::DoSet3StateValue(wxCheckBoxState state)
XtVaSetValues( (Widget) m_mainWidget,
XmNset, value,
NULL );
XtVaSetValues( (Widget) m_mainWidget,
XmNset, value,
NULL );
+#else
+ XmToggleButtonSetState ((Widget) m_mainWidget,
+ state == wxCHK_CHECKED, True);
+#endif
m_inSetValue = false;
}
wxCheckBoxState wxCheckBox::DoGet3StateValue() const
{
m_inSetValue = false;
}
wxCheckBoxState wxCheckBox::DoGet3StateValue() const
{
+#if wxHAS_3STATE
unsigned char value = 0;
XtVaGetValues( (Widget) m_mainWidget,
unsigned char value = 0;
XtVaGetValues( (Widget) m_mainWidget,
@@
-198,6
+206,9
@@
wxCheckBoxState wxCheckBox::DoGet3StateValue() const
// impossible...
return wxCHK_UNDETERMINED;
// impossible...
return wxCHK_UNDETERMINED;
+#else
+ return wxCheckBoxState(XmToggleButtonGetState ((Widget) m_mainWidget));
+#endif
}
///////////////////////////////////////////////////////////////////////////////
}
///////////////////////////////////////////////////////////////////////////////