Mini-fix for wxStaticBitmap

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

diff --git a/src/motif/combobox.cpp b/src/motif/combobox.cpp
index 89e9a1dfcd828a63822b5af9fb0ca9bbe94176a4..b24da1adb019aa0c960577ce88fa62120c7ef386 100644 (file)
--- a/src/motif/combobox.cpp
+++ b/src/motif/combobox.cpp
@@ -84,7 +84,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
     
     SetValue(value);
     
-    m_windowFont = parent->GetFont();
+    m_font = parent->GetFont();
     ChangeFont(FALSE);
     
     SetCanAddEventHandler(TRUE);
@@ -102,10 +102,10 @@ wxComboBox::~wxComboBox()
     m_mainWidget = (WXWidget) 0;
 }
 
-void wxComboBox::SetSize(int x, int y, int width, int height, int sizeFlags)
+void wxComboBox::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
     // Necessary so it doesn't call wxChoice::SetSize
-    wxWindow::SetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
 }
 
 wxString wxComboBox::GetValue() const