let the popup listbox process the kbd messages in wxComboBox

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 4f1bff720167a088f913316c8e3cbb9164ef26e7..efcb6da2979c6d0a0a3370531bc80735a19a1337 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -37,7 +37,7 @@
 #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_OLD__) || defined(__TWIN32__))
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))

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


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

-  SetBackgroundColour(parent->GetBackgroundColour());
-  SetForegroundColour(parent->GetForegroundColour());
-

   m_windowStyle = style;
 
   if ( id == -1 )
   m_windowStyle = style;
 
   if ( id == -1 )


@@ -106,6 +103,10 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
 
   long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
 
 
   long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
 

+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+    msFlags |= WS_CLIPSIBLINGS;
+
+

   if (m_windowStyle & wxGA_VERTICAL)
     msFlags |= PBS_VERTICAL;
 
   if (m_windowStyle & wxGA_VERTICAL)
     msFlags |= PBS_VERTICAL;
 


@@ -119,6 +120,9 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
 
   m_hWnd = (WXHWND)wx_button;
 
 
   m_hWnd = (WXHWND)wx_button;
 

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

   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND) wx_button);
 
   // Subclass again for purposes of dialog editing mode
   SubclassWin((WXHWND) wx_button);
 


@@ -137,11 +141,11 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   return TRUE;
 }
 
   return TRUE;
 }
 

-void wxGauge95::SetShadowWidth(int w)
+void wxGauge95::SetShadowWidth(int WXUNUSED(w))

 {
 }
 
 {
 }
 

-void wxGauge95::SetBezelFace(int w)
+void wxGauge95::SetBezelFace(int WXUNUSED(w))

 {
 }
 
 {
 }