Compilaton fixes.

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 74e164915802718a47474ba21a655bc666257a2e..7df84ca373ef2aaf0e231bc7f79c95f6cb45435a 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$
 // 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
+// Copyright:   (c) Julian Smart
+// 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,12 +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__) || defined(wxUSE_NORLANDER_HEADERS)
-#include <commctrl.h>
+#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
+    #include <commctrl.h>
+#endif
+
+// ----------------------------------------------------------------------------
+// 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
+
+#ifndef PBM_SETBARCOLOR
+    #define PBM_SETBARCOLOR         (WM_USER+9)

 #endif
 
 #endif
 

+#ifndef PBM_SETBKCOLOR
+    #define PBM_SETBKCOLOR          0x2001
+#endif
+
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+

 IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
 
 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,


@@ -52,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 )


@@ -67,29 +101,25 @@ bool wxGauge95::Create(wxWindow *parent, wxWindowID id,
   int width = size.x;
   int height = size.y;
 
   int width = size.x;
   int height = size.y;
 

-  long msFlags = WS_CHILD | WS_VISIBLE;
-
-#ifndef PBS_VERTICAL
-#define PBS_VERTICAL 0x04
-#endif
+  WXDWORD exStyle = 0;
+  long msFlags = MSWGetStyle(style, & exStyle) ;

 
   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;
 
   HWND wx_button =
   if (m_windowStyle & wxGA_SMOOTH)
     msFlags |= PBS_SMOOTH;
 
   HWND wx_button =

-      CreateWindowEx(MakeExtendedStyle(m_windowStyle), PROGRESS_CLASS, NULL, msFlags,
+      CreateWindowEx(exStyle, PROGRESS_CLASS, NULL, msFlags,

                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 
   m_hWnd = (WXHWND)wx_button;
 
                     0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
                     wxGetInstance(), NULL);
 
   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,11 +138,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))

 {
 }
 
 {
 }
 


@@ -130,22 +160,22 @@ 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;
 }


@@ -155,7 +185,7 @@ bool wxGauge95::SetForegroundColour(const wxColour& col)
     if ( !wxControl::SetForegroundColour(col) )
         return FALSE;
 
     if ( !wxControl::SetForegroundColour(col) )
         return FALSE;
 

-    m_foregroundColour = col ;
+    SendMessage(GetHwnd(), PBM_SETBARCOLOR, 0, (LPARAM)wxColourToRGB(col));

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -165,7 +195,7 @@ bool wxGauge95::SetBackgroundColour(const wxColour& col)
     if ( !wxControl::SetBackgroundColour(col) )
         return FALSE;
 
     if ( !wxControl::SetBackgroundColour(col) )
         return FALSE;
 

-    m_backgroundColour = col ;
+    SendMessage(GetHwnd(), PBM_SETBKCOLOR, 0, (LPARAM)wxColourToRGB(col));

 
     return TRUE;
 }
 
     return TRUE;
 }