Added George Tasker's forward slash fix to file dialog; added some consts to prntbase.h;

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

diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp
index d5348816b6eb283c2ba7ce20b127158179b0e651..9de6a74b3be04c2b79255a5507b713d6cf50ff11 100644 (file)
--- a/src/msw/listbox.cpp
+++ b/src/msw/listbox.cpp
@@ -33,9 +33,11 @@
 #include <windows.h>
 #include <windowsx.h>
 
 #include <windows.h>
 #include <windowsx.h>
 

+#ifndef __TWIN32__

 #ifdef __GNUWIN32__
 #include <wx/msw/gnuwin32/extra.h>
 #endif
 #ifdef __GNUWIN32__
 #include <wx/msw/gnuwin32/extra.h>
 #endif

+#endif

 
 #ifdef GetCharWidth
 #undef GetCharWidth
 
 #ifdef GetCharWidth
 #undef GetCharWidth


@@ -214,7 +216,7 @@ bool wxListBox::Create(wxWindow *parent, wxWindowID id,
 
   wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" );
 
 
   wxCHECK_MSG( m_hWnd, FALSE, "Failed to create listbox" );
 

-#if CTL3D
+#if wxUSE_CTL3D

   if (want3D)
   {
     Ctl3dSubclassCtl(hwnd);
   if (want3D)
   {
     Ctl3dSubclassCtl(hwnd);


@@ -498,7 +500,7 @@ void wxListBox::SetSize(int x, int y, int width, int height, int sizeFlags)
   int cx; // button font dimensions
   int cy;
 
   int cx; // button font dimensions
   int cy;
 

-  wxGetCharSize(GetHWND(), &cx, &cy, & GetFont());
+  wxGetCharSize(GetHWND(), &cx, &cy, & this->GetFont());

 
   float control_width, control_height, control_x, control_y;
 
 
   float control_width, control_height, control_x, control_y;
 


@@ -686,7 +688,7 @@ void wxListBox::Command (wxCommandEvent & event)
 WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {
 WXHBRUSH wxListBox::OnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor,
                        WXUINT message, WXWPARAM wParam, WXLPARAM lParam)
 {

-#if CTL3D
+#if wxUSE_CTL3D

   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);
   if ( m_useCtl3D )
   {
     HBRUSH hbrush = Ctl3dCtlColorEx(message, wParam, lParam);