1. fixes for non-Posix sh in configure

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

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index 4ca6a3955b3551b79536795acad979137c6a0a9e..b7cf16551aaee3ed605dc6733ebf6170a8dd728b 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -20,18 +20,24 @@
     #pragma hdrstop
 #endif
 
+#include <windowsx.h>
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/listbox.h"
-    #include "wx/settings.h"
-    #include "wx/brush.h"
-    #include "wx/font.h"
-    #include "wx/dc.h"
+#include "wx/listbox.h"
+#include "wx/settings.h"
+#include "wx/brush.h"
+#include "wx/font.h"
+#include "wx/dc.h"
 #endif
 
-#include "wx/msw/private.h"
+#include "wx/dynarray.h"
+#include "wx/log.h"
 
-#include <windows.h>
-#include <windowsx.h>
+#if wxUSE_OWNER_DRAWN
+    #include  "wx/ownerdrw.h"
+#endif
 
 #ifndef __TWIN32__
     #ifdef __GNUWIN32__
@@ -39,16 +45,6 @@
     #endif
 #endif
 
-#ifdef GetCharWidth
-    #undef GetCharWidth
-#endif
-
-#if wxUSE_OWNER_DRAWN
-    #include  "wx/ownerdrw.h"
-#endif
-
-#include "wx/dynarray.h"
-#include "wx/log.h"
 
 #if !USE_SHARED_LIBRARY
     IMPLEMENT_DYNAMIC_CLASS(wxListBox, wxControl)
@@ -165,7 +161,8 @@ bool wxListBox::Create(wxWindow *parent,
     int height = size.y;
     m_windowStyle = style;
 
-    DWORD wstyle = WS_VSCROLL | WS_TABSTOP | LBS_NOTIFY | LBS_HASSTRINGS;
+    DWORD wstyle = WS_VISIBLE | WS_VSCROLL | WS_TABSTOP |
+                   LBS_NOTIFY | LBS_HASSTRINGS;
     if (m_windowStyle & wxLB_MULTIPLE)
         wstyle |= LBS_MULTIPLESEL;
     else if (m_windowStyle & wxLB_EXTENDED)