Dialog Editor bug fixes, several other small ones

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

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 0c59e67684130ad59e42212148a06262cc4d324c..7d40ee43305fd59d3ab83a25eb6047c741c4f625 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -66,12 +66,13 @@ bool wxCheckBox::Create(wxWindow *parent, wxWindowID id, const wxString& label,
 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 
 
     XmToggleButtonSetState ((Widget) m_mainWidget, FALSE, TRUE);
 

+    m_windowFont = parent->GetFont();
+    ChangeFont(FALSE);
+

     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();
     SetCanAddEventHandler(TRUE);
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL, pos.x, pos.y, size.x, size.y);
 
     ChangeBackgroundColour();

-    SetFont(* parent->GetFont());
-

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -151,9 +152,9 @@ void wxCheckBoxCallback (Widget w, XtPointer clientData,
   item->ProcessCommand (event);
 }
 
   item->ProcessCommand (event);
 }
 

-void wxCheckBox::ChangeFont()
+void wxCheckBox::ChangeFont(bool keepOriginalSize)

 {
 {

-    wxWindow::ChangeFont();
+    wxWindow::ChangeFont(keepOriginalSize);

 }
 
 void wxCheckBox::ChangeBackgroundColour()
 }
 
 void wxCheckBox::ChangeBackgroundColour()