compilation fix: wxcrt.h, not crt.h

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

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index 817b9b1c99dd8300c0332f0d038eada17dfc3957..74b891b29388a5a5e0281636848da8cfe610c5ae 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -52,21 +52,23 @@ static void wxListBoxCallback(Widget w,
 class wxSizeKeeper
 {
     int m_x, m_y;
-    wxWindow* m_w;
+    int m_w, m_h;
+    wxWindow* m_wnd;
 public:
     wxSizeKeeper( wxWindow* w )
-        : m_w( w )
+        : m_wnd( w )
     {
-        m_w->GetSize( &m_x, &m_y );
+        m_wnd->GetSize( &m_w, &m_h );
+        m_wnd->GetPosition( &m_x, &m_y );
     }
 
     void Restore()
     {
         int x, y;
 
-        m_w->GetSize( &x, &y );
+        m_wnd->GetSize( &x, &y );
         if( x != m_x || y != m_y )
-            m_w->SetSize( -1, -1, m_x, m_y );
+            m_wnd->SetSize( m_x, m_y, m_w, m_h );
     }
 };
 
@@ -91,9 +93,9 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
     if( !wxControl::CreateControl( parent, id, pos, size, style,
                                    validator, name ) )
         return false;
+    PreCreation();
 
     m_noItems = (unsigned int)n;
-    m_backgroundColour = * wxWHITE;
 
     Widget parentWidget = (Widget) parent->GetClientWidget();
     Display* dpy = XtDisplay(parentWidget);
@@ -149,11 +151,10 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
                    (XtCallbackProc) wxListBoxCallback,
                    (XtPointer) this);
 
+    PostCreation();
     AttachWidget (parent, m_mainWidget, (WXWidget) NULL,
                   pos.x, pos.y, best.x, best.y);
 
-    ChangeBackgroundColour();
-
     return true;
 }