1. DoSetSize() simplified, DoGetBestSize() introduced

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

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index d73b55569bb1b4ad1222e65653a8e1cc16d34db2..7092369312ec2bad88989fd89b6df9c6677822dc 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -26,7 +26,7 @@
 #include <wx/motif/private.h>
 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
 #include <wx/motif/private.h>
 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,

-  XmToggleButtonCallbackStruct * cbs);
+                            XmToggleButtonCallbackStruct * cbs);

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxRadioButton, wxControl)


@@ -37,60 +37,60 @@ wxRadioButton::wxRadioButton()
 }
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxRadioButton::Create(wxWindow *parent, wxWindowID id,

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

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

-    m_windowFont = parent->GetFont();
-
+    m_font = parent->GetFont();
+    

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

-
+    

     if ( id == -1 )
     if ( id == -1 )

-           m_windowId = (int)NewControlId();
+        m_windowId = (int)NewControlId();

     else
     else

-           m_windowId = id;
-
+        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_windowFont.GetFontList(1.0, XtDisplay(parentWidget));
-
+    
+    XmFontList fontList = (XmFontList) m_font.GetFontList(1.0, XtDisplay(parentWidget));
+    

     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS
     Widget radioButtonWidget = XtVaCreateManagedWidget ("toggle",
 #if wxUSE_GADGETS

-                    xmToggleButtonGadgetClass, parentWidget,
+        xmToggleButtonGadgetClass, parentWidget,

 #else
 #else

-                    xmToggleButtonWidgetClass, parentWidget,
+        xmToggleButtonWidgetClass, parentWidget,

 #endif
 #endif

-                    XmNfontList, fontList,
-                    XmNlabelString, text,
-                    XmNfillOnSelect, True,
-                    XmNindicatorType, XmONE_OF_MANY, // diamond-shape
-                                                NULL);
+        XmNfontList, fontList,
+        XmNlabelString, text,
+        XmNfillOnSelect, True,
+        XmNindicatorType, XmONE_OF_MANY, // diamond-shape
+        NULL);

     XmStringFree (text);
     XmStringFree (text);

-
+    

     XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,
     XtAddCallback (radioButtonWidget, XmNvalueChangedCallback, (XtCallbackProc) wxRadioButtonCallback,

-                    (XtCallbackProc) this);
-
+        (XtCallbackProc) this);
+    

     m_mainWidget = (WXWidget) radioButtonWidget;
     m_mainWidget = (WXWidget) radioButtonWidget;

-
+    

     XtManageChild (radioButtonWidget);
     XtManageChild (radioButtonWidget);

-
+    

     SetCanAddEventHandler(TRUE);
     SetCanAddEventHandler(TRUE);

-    AttachWidget (parent, m_mainWidget, NULL, pos.x, pos.y, size.x, size.y);
-
+    AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
+    

     ChangeBackgroundColour();
     ChangeBackgroundColour();

-
+    

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -109,8 +109,8 @@ bool wxRadioButton::GetValue() const
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {
 
 void wxRadioButton::Command (wxCommandEvent & event)
 {

-  SetValue ( (event.m_commandInt != 0) );
-  ProcessCommand (event);
+    SetValue ( (event.m_commandInt != 0) );
+    ProcessCommand (event);

 }
 
 void wxRadioButton::ChangeFont(bool keepOriginalSize)
 }
 
 void wxRadioButton::ChangeFont(bool keepOriginalSize)


@@ -121,6 +121,13 @@ void wxRadioButton::ChangeFont(bool keepOriginalSize)
 void wxRadioButton::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();
 void wxRadioButton::ChangeBackgroundColour()
 {
     wxWindow::ChangeBackgroundColour();

+
+    // What colour should this be?
+    int selectPixel = wxBLACK->AllocColour(wxGetDisplay());
+
+    XtVaSetValues ((Widget) GetMainWidget(),
+          XmNselectColor, selectPixel,
+          NULL);

 }
 
 void wxRadioButton::ChangeForegroundColour()
 }
 
 void wxRadioButton::ChangeForegroundColour()


@@ -129,18 +136,18 @@ void wxRadioButton::ChangeForegroundColour()
 }
 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,
 }
 
 void wxRadioButtonCallback (Widget w, XtPointer clientData,

-                   XmToggleButtonCallbackStruct * cbs)
+                            XmToggleButtonCallbackStruct * cbs)

 {
 {

-  if (!cbs->set)
-    return;
-
-  wxRadioButton *item = (wxRadioButton *) clientData;
-  if (item->InSetValue())
-    return;
-
-  wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
-  event.SetEventObject(item);
-
-  item->ProcessCommand (event);
+    if (!cbs->set)
+        return;
+    
+    wxRadioButton *item = (wxRadioButton *) clientData;
+    if (item->InSetValue())
+        return;
+    
+    wxCommandEvent event (wxEVT_COMMAND_RADIOBUTTON_SELECTED, item->GetId());
+    event.SetEventObject(item);
+    
+    item->ProcessCommand (event);

 }
 
 }