projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates for Y positioning
[wxWidgets.git]
/
src
/
motif
/
radiobut.cpp
diff --git
a/src/motif/radiobut.cpp
b/src/motif/radiobut.cpp
index 7092369312ec2bad88989fd89b6df9c6677822dc..9d77c21388a01c6b2de3990fcab1f57c2c86b104 100644
(file)
--- a/
src/motif/radiobut.cpp
+++ b/
src/motif/radiobut.cpp
@@
-13,24
+13,34
@@
#pragma implementation "radiobut.h"
#endif
#pragma implementation "radiobut.h"
#endif
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
+#include "wx/defs.h"
+
#include "wx/radiobut.h"
#include "wx/utils.h"
#include "wx/radiobut.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/RowColumn.h>
#include <Xm/Form.h>
#include <Xm/Label.h>
#include <Xm/LabelG.h>
#include <Xm/ToggleB.h>
#include <Xm/ToggleBG.h>
#include <Xm/RowColumn.h>
#include <Xm/Form.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
-#include
<wx/motif/private.h>
+#include
"wx/motif/private.h"
void wxRadioButtonCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
void wxRadioButtonCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
-#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-#endif
wxRadioButton::wxRadioButton()
{
wxRadioButton::wxRadioButton()
{
@@
-48,24
+58,24
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
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 = (int)NewControlId();
else
m_windowId = id;
if ( id == -1 )
m_windowId = (int)NewControlId();
else
m_windowId = id;
-
+
m_windowStyle = style ;
m_windowStyle = style ;
-
+
Widget parentWidget = (Widget) parent->GetClientWidget();
Widget parentWidget = (Widget) parent->GetClientWidget();
-
+
wxString label1(wxStripMenuCodes(label));
wxString label1(wxStripMenuCodes(label));
-
+
XmString text = XmStringCreateSimple ((char*) (const char*) label1);
XmString text = XmStringCreateSimple ((char*) (const char*) label1);
-
+
XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
-
+
Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
#if wxUSE_GADGETS
xmToggleButtonGadgetClass, parentWidget,
Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
#if wxUSE_GADGETS
xmToggleButtonGadgetClass, parentWidget,
@@
-78,19
+88,19
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
XmNindicatorType, XmONE_OF_MANY, // diamond-shape
NULL);
XmStringFree (text);
XmNindicatorType, XmONE_OF_MANY, // diamond-shape
NULL);
XmStringFree (text);
-
+
XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
- (Xt
CallbackProc
) this);
-
+ (Xt
Pointer
) this);
+
m_mainWidget = (WXWidget) radioButtonWidget;
m_mainWidget = (WXWidget) radioButtonWidget;
-
+
XtManageChild (radioButtonWidget);
XtManageChild (radioButtonWidget);
-
+
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();
ChangeBackgroundColour();
-
+
return TRUE;
}
return TRUE;
}
@@
-140,14
+150,14
@@
void wxRadioButtonCallback (Widget w, XtPointer clientData,
{
if (!cbs->set)
return;
{
if (!cbs->set)
return;
-
+
wxRadioButton *item = (wxRadioButton *) clientData;
if (item->InSetValue())
return;
wxRadioButton *item = (wxRadioButton *) clientData;
if (item->InSetValue())
return;
-
+
wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
event.SetEventObject(item);
wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
event.SetEventObject(item);
-
+
item->ProcessCommand (event);
}
item->ProcessCommand (event);
}