projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding implementation for osx
[wxWidgets.git]
/
src
/
motif
/
radiobut.cpp
diff --git
a/src/motif/radiobut.cpp
b/src/motif/radiobut.cpp
index 5f9674abced7daa1c5116a336d55e8d5f980e297..d6832a3f6df942ca99731bb237740045cf506b28 100644
(file)
--- a/
src/motif/radiobut.cpp
+++ b/
src/motif/radiobut.cpp
@@
-1,25
+1,22
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: radiobut.cpp
+// Name:
src/motif/
radiobut.cpp
// Purpose: wxRadioButton
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
// Purpose: wxRadioButton
// Author: Julian Smart
// Modified by:
// Created: 17/09/98
// RCS-ID: $Id$
// Copyright: (c) Julian Smart
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
/////////////////////////////////////////////////////////////////////////////
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
-#include "wx/defs.h"
-
#include "wx/radiobut.h"
#include "wx/radiobut.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/utils.h"
+#endif
#ifdef __VMS__
#pragma message disable nosimpint
#ifdef __VMS__
#pragma message disable nosimpint
@@
-35,8
+32,6
@@
void wxRadioButtonCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
void wxRadioButtonCallback (Widget w, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs);
-IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
-
wxRadioButton::wxRadioButton()
{
}
wxRadioButton::wxRadioButton()
{
}
@@
-50,11
+45,12
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
{
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
return false;
{
if( !CreateControl( parent, id, pos, size, style, validator, name ) )
return false;
+ PreCreation();
Widget parentWidget = (Widget) parent->GetClientWidget();
Display* dpy = XtDisplay(parentWidget);
Widget parentWidget = (Widget) parent->GetClientWidget();
Display* dpy = XtDisplay(parentWidget);
- wxString label1(
wxStripMenuCodes
(label));
+ wxString label1(
GetLabelText
(label));
wxXmString text( label1 );
wxXmString text( label1 );
@@
-79,11
+75,10
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
XtManageChild (radioButtonWidget);
XtManageChild (radioButtonWidget);
+ PostCreation();
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();
-
//copied from mac/radiobut.cpp (from here till "return true;")
m_cycle = this ;
//copied from mac/radiobut.cpp (from here till "return true;")
m_cycle = this ;
@@
-94,7
+89,7
@@
bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
else
{
/* search backward for last group start */
else
{
/* search backward for last group start */
- wxRadioButton *chief =
(wxRadioButton*)
NULL;
+ wxRadioButton *chief = NULL;
wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
while (node)
{
wxWindowList::compatibility_iterator node = parent->GetChildren().GetLast();
while (node)
{
@@
-140,14
+135,15
@@
void wxRadioButton::ChangeBackgroundColour()
wxWindow::ChangeBackgroundColour();
// What colour should this be?
wxWindow::ChangeBackgroundColour();
// What colour should this be?
- int selectPixel = wxBLACK->AllocColour(XtDisplay((Widget)m_mainWidget));
+ wxColour colour = *wxBLACK;
+ WXPixel selectPixel = colour.AllocColour(XtDisplay((Widget)m_mainWidget));
XtVaSetValues ((Widget) GetMainWidget(),
XmNselectColor, selectPixel,
NULL);
}
XtVaSetValues ((Widget) GetMainWidget(),
XmNselectColor, selectPixel,
NULL);
}
-void wxRadioButtonCallback (Widget
w
, XtPointer clientData,
+void wxRadioButtonCallback (Widget
WXUNUSED(w)
, XtPointer clientData,
XmToggleButtonCallbackStruct * cbs)
{
if (!cbs->set)
XmToggleButtonCallbackStruct * cbs)
{
if (!cbs->set)