wxMimeTypesManager now supports creating associations as well as querying

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

diff --git a/src/msw/gaugemsw.cpp b/src/msw/gaugemsw.cpp
index 5a86380c51738f04329fc28aec27af1cb0bcf5fb..278fbfce57852f0ad779281bc4a1310a908fc7e5 100644 (file)
--- a/src/msw/gaugemsw.cpp
+++ b/src/msw/gaugemsw.cpp
@@ -60,9 +60,7 @@
 /* public function prototypes */
 BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance);
 
 /* public function prototypes */
 BOOL FAR PASCAL gaugeInit(HINSTANCE hInstance);
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxGaugeMSW, wxControl)

-#endif

 
 bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
            int range,
 
 bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
            int range,


@@ -82,7 +80,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   }
 
   SetName(name);
   }
 
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;
 
   if (parent) parent->AddChild(this);
   m_rangeMax = range;


@@ -104,7 +104,10 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   int height = size.y;
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
   int height = size.y;
 
   long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;

-  msFlags |= ZYZGS_3D;
+  bool want3D;
+  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);
+  if (want3D)
+    msFlags |= ZYZGS_3D;

 
   HWND wx_button =
       CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("zYzGauge"), NULL, msFlags,
 
   HWND wx_button =
       CreateWindowEx(MakeExtendedStyle(m_windowStyle), wxT("zYzGauge"), NULL, msFlags,


@@ -129,6 +132,9 @@ bool wxGaugeMSW::Create(wxWindow *parent, wxWindowID id,
   SendMessage(GetHwnd(), ZYZG_SETFGCOLOR, 0, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
   SendMessage(GetHwnd(), ZYZG_SETBKCOLOR, 0, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
 
   SendMessage(GetHwnd(), ZYZG_SETFGCOLOR, 0, RGB(GetForegroundColour().Red(), GetForegroundColour().Green(), GetForegroundColour().Blue()));
   SendMessage(GetHwnd(), ZYZG_SETBKCOLOR, 0, RGB(GetBackgroundColour().Red(), GetBackgroundColour().Green(), GetBackgroundColour().Blue()));
 

+  //SetBezelFace(1);
+  //SetShadowWidth(1);
+

   SetFont(parent->GetFont());
 
   if (width == -1)
   SetFont(parent->GetFont());
 
   if (width == -1)