Start of actual filling in of wxFrame. Makefile now supports tiff

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index ade3fdca7ce4924ee623022fbb892fb1f40c773c..c43b527cb65784d1744231e7116aecc1d10f465a 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -29,13 +29,11 @@
 #include "wx/msw/gauge95.h"
 #include "wx/msw/private.h"
 
-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
-#include <commctrl.h>
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) || defined(__TWIN32__))
+    #include <commctrl.h>
 #endif
 
-#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
-#endif
 
 bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
            int range,
@@ -46,7 +44,9 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
   SetName(name);
+#if wxUSE_VALIDATORS
   SetValidator(validator);
+#endif // wxUSE_VALIDATORS
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
@@ -67,7 +67,7 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   int width = size.x;
   int height = size.y;
 
-  long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
+  long msFlags = WS_CHILD | WS_VISIBLE;
 
 #ifndef PBS_VERTICAL
 #define PBS_VERTICAL 0x04