erase separators shown behind the controls added to the toolbar

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index f0e0bc8932ec7021e7513b3f0bd471e7ec7f5615..efcb6da2979c6d0a0a3370531bc80735a19a1337 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -1,16 +1,24 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gauge95.cpp
+// Name:        src/msw/gauge95.cpp

 // Purpose:     wxGauge95 class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem
 // Purpose:     wxGauge95 class
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart and Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "gauge95.h"
+    #pragma implementation "gauge95.h"

 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".


@@ -21,7 +29,7 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/defs.h"
+    #include "wx/defs.h"

 #endif
 
 #if wxUSE_GAUGE && defined(__WIN95__)
 #endif
 
 #if wxUSE_GAUGE && defined(__WIN95__)


@@ -29,14 +37,41 @@
 #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__)) || defined(__TWIN32__)
-#include <commctrl.h>
+#if defined(__WIN95__) && !((defined(__GNUWIN32_OLD__) || defined(__TWIN32__)) && !defined(__CYGWIN10__))
+    #include <commctrl.h>

 #endif
 
 #endif
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// old commctrl.h (< 4.71) don't have those
+#ifndef PBS_SMOOTH
+    #define PBS_SMOOTH 0x01
+#endif
+
+#ifndef PBS_VERTICAL
+    #define PBS_VERTICAL 0x04

 #endif
 
 #endif
 

+#ifndef PBM_SETBARCOLOR
+    #define PBM_SETBARCOLOR         (WM_USER+9)
+#endif
+
+#ifndef PBM_SETBKCOLOR
+    #define PBM_SETBKCOLOR          0x2001
+#endif
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
+
+// ============================================================================
+// implementation
+// ============================================================================
+

 bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,
 bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
            int range,
            const wxPoint& pos,


@@ -46,40 +81,35 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
            const wxString& name)
 {
   SetName(name);
            const wxString& name)
 {
   SetName(name);

+#if wxUSE_VALIDATORS

   SetValidator(validator);
   SetValidator(validator);

+#endif // wxUSE_VALIDATORS

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

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

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

-       m_windowId = (int)NewControlId();
+      m_windowId = (int)NewControlId();

   else
   else

-       m_windowId = id;
+      m_windowId = id;

 
   int x = pos.x;
   int y = pos.y;
   int width = size.x;
   int height = size.y;
 
 
   int x = pos.x;
   int y = pos.y;
   int width = size.x;
   int height = size.y;
 

-  long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
+  long msFlags = WS_CHILD | WS_VISIBLE /* | WS_CLIPSIBLINGS */;
+
+  if ( m_windowStyle & wxCLIP_SIBLINGS )
+    msFlags |= WS_CLIPSIBLINGS;

 
 

-#ifndef PBS_VERTICAL
-#define PBS_VERTICAL 0x04
-#endif

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

-#ifndef PBS_SMOOTH
-#define PBS_SMOOTH 0x01
-#endif
-

   if (m_windowStyle & wxGA_SMOOTH)
     msFlags |= PBS_SMOOTH;
 
   if (m_windowStyle & wxGA_SMOOTH)
     msFlags |= PBS_SMOOTH;
 


@@ -90,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);
 


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

-void wxGauge95::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+void wxGauge95::SetShadowWidth(int WXUNUSED(w))

 {
 {

-  int currentX, currentY;
-  GetPosition(&currentX, &currentY);
-  int x1 = x;
-  int y1 = y;
-  int w1 = width;
-  int h1 = height;
-
-  if (x == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    x1 = currentX;
-  if (y == -1 || (sizeFlags & wxSIZE_ALLOW_MINUS_ONE))
-    y1 = currentY;
-
-  AdjustForParentClientOrigin(x1, y1, sizeFlags);
-
-  // If we're prepared to use the existing size, then...
-  if (width == -1 && height == -1 && ((sizeFlags & wxSIZE_AUTO) != wxSIZE_AUTO))
-  {
-    GetSize(&w1, &h1);
-  }
-
-  // Deal with default size (using -1 values)
-  if (w1<=0)
-    w1 = DEFAULT_ITEM_WIDTH;
-
-  if (h1<=0)
-    h1 = DEFAULT_ITEM_HEIGHT;
-
-  MoveWindow((HWND) GetHWND(), x1, y1, w1, h1, TRUE);

 }
 
 }
 

-void wxGauge95::SetShadowWidth(int w)
-{
-}
-
-void wxGauge95::SetBezelFace(int w)
+void wxGauge95::SetBezelFace(int WXUNUSED(w))

 {
 }
 
 {
 }
 


@@ -162,34 +163,44 @@ void wxGauge95::SetValue(int pos)
   SendMessage((HWND) GetHWND(), PBM_SETPOS, pos, 0);
 }
 
   SendMessage((HWND) GetHWND(), PBM_SETPOS, pos, 0);
 }
 

-int wxGauge95::GetShadowWidth(void) const
+int wxGauge95::GetShadowWidth() const

 {
   return 0;
 }
 
 {
   return 0;
 }
 

-int wxGauge95::GetBezelFace(void) const
+int wxGauge95::GetBezelFace() const

 {
   return 0;
 }
 
 {
   return 0;
 }
 

-int wxGauge95::GetRange(void) const
+int wxGauge95::GetRange() const

 {
   return m_rangeMax;
 }
 
 {
   return m_rangeMax;
 }
 

-int wxGauge95::GetValue(void) const
+int wxGauge95::GetValue() const

 {
   return m_gaugePos;
 }
 
 {
   return m_gaugePos;
 }
 

-void wxGauge95::SetForegroundColour(const wxColour& col)
+bool wxGauge95::SetForegroundColour(const wxColour& col)

 {
 {

-  m_foregroundColour = col ;
+    if ( !wxControl::SetForegroundColour(col) )
+        return FALSE;
+
+    SendMessage(GetHwnd(), PBM_SETBARCOLOR, 0, (LPARAM)wxColourToRGB(col));
+
+    return TRUE;

 }
 
 }
 

-void wxGauge95::SetBackgroundColour(const wxColour& col)
+bool wxGauge95::SetBackgroundColour(const wxColour& col)

 {
 {

-  m_backgroundColour = col ;
+    if ( !wxControl::SetBackgroundColour(col) )
+        return FALSE;
+
+    SendMessage(GetHwnd(), PBM_SETBKCOLOR, 0, (LPARAM)wxColourToRGB(col));
+
+    return TRUE;

 }
 
 #endif // wxUSE_GAUGE
 }
 
 #endif // wxUSE_GAUGE