wxListCtrl column resize bug corrected

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index d0ddf67099cf00ac5072b8c1fd02ab3e37b13475..3f934a58c082f31407b2f5ab302d83482d93c33d 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -24,12 +24,12 @@
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"
 #endif
 

-#if USE_GAUGE && defined(__WIN95__)
+#if wxUSE_GAUGE && defined(__WIN95__)

 
 #include "wx/msw/gauge95.h"
 #include "wx/msw/private.h"
 
 
 #include "wx/msw/gauge95.h"
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)

 #include <commctrl.h>
 #endif
 
 #include <commctrl.h>
 #endif
 


@@ -52,8 +52,8 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   m_rangeMax = range;
   m_gaugePos = 0;
 
   m_rangeMax = range;
   m_gaugePos = 0;
 

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+  SetBackgroundColour(parent->GetBackgroundColour()) ;
+  SetForegroundColour(parent->GetForegroundColour()) ;

 
   m_windowStyle = style;
 
 
   m_windowStyle = style;
 


@@ -81,12 +81,12 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
 
   SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, range));
 
 
   SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, range));
 

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

 
   if (width == -1)
     width = 50;
   if (height == -1)
 
   if (width == -1)
     width = 50;
   if (height == -1)

-    height = 50;
+    height = 28;

   SetSize(x, y, width, height);
 
   ShowWindow((HWND) GetHWND(), SW_SHOW);
   SetSize(x, y, width, height);
 
   ShowWindow((HWND) GetHWND(), SW_SHOW);


@@ -178,4 +178,4 @@ void wxGauge95::SetBackgroundColour(const wxColour& col)
   m_backgroundColour = col ;
 }
 
   m_backgroundColour = col ;
 }
 

-#endif // USE_GAUGE
+#endif // wxUSE_GAUGE