more native look for wxCheckListBox (especially under XP) (modified patch 1690068)

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

diff --git a/src/msw/gauge95.cpp b/src/msw/gauge95.cpp
index 6a2f7c668ffff1c1d2424836e1db58e2c6b307e5..6f8d8724e4e569fd24cacd6fe75c381eff986ea1 100644 (file)
--- a/src/msw/gauge95.cpp
+++ b/src/msw/gauge95.cpp
@@ -1,186 +1,276 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// 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

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

-#ifdef __GNUG__
-#pragma implementation "gauge95.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_GAUGE
+
+#include "wx/gauge.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

 
 

-#if USE_GAUGE && defined(__WIN95__)
+    #include "wx/msw/wrapcctl.h" // include <commctrl.h> "properly"
+#endif

 
 

-#include "wx/msw/gauge95.h"

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

-#if defined(__WIN95__) && !defined(__GNUWIN32__)
-#include <commctrl.h>
-#endif
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------

 
 

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

 #endif
 
 #endif
 

-bool wxGauge95::Create(wxWindow *parent, const wxWindowID id,
-           const int range,
-           const wxPoint& pos,
-           const wxSize& size,
-           const long style,
-           const wxValidator& validator,
-           const wxString& name)
-{
-  SetName(name);
-  SetValidator(validator);
+#ifndef PBS_VERTICAL
+    #define PBS_VERTICAL 0x04
+#endif

 
 

-  if (parent) parent->AddChild(this);
-  m_rangeMax = range;
+#ifndef PBM_SETBARCOLOR
+    #define PBM_SETBARCOLOR         (WM_USER+9)
+#endif

 
 

-  SetBackgroundColour(parent->GetDefaultBackgroundColour()) ;
-  SetForegroundColour(parent->GetDefaultForegroundColour()) ;
+#ifndef PBM_SETBKCOLOR
+    #define PBM_SETBKCOLOR          0x2001
+#endif

 
 

-  m_windowStyle = style;
+#ifndef PBS_MARQUEE
+    #define PBS_MARQUEE             0x08
+#endif

 
 

-  if ( id == -1 )
-       m_windowId = (int)NewControlId();
-  else
-       m_windowId = id;
+#ifndef PBM_SETMARQUEE
+    #define PBM_SETMARQUEE          (WM_USER+10)
+#endif

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+// ----------------------------------------------------------------------------
+// wxWin macros
+// ----------------------------------------------------------------------------
+
+#if wxUSE_EXTENDED_RTTI
+WX_DEFINE_FLAGS( wxGaugeStyle )
+
+wxBEGIN_FLAGS( wxGaugeStyle )
+    // new style border flags, we put them first to
+    // use them for streaming out
+    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
+    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
+    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
+    wxFLAGS_MEMBER(wxBORDER_RAISED)
+    wxFLAGS_MEMBER(wxBORDER_STATIC)
+    wxFLAGS_MEMBER(wxBORDER_NONE)
+
+    // old style border flags
+    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
+    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
+    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
+    wxFLAGS_MEMBER(wxRAISED_BORDER)
+    wxFLAGS_MEMBER(wxSTATIC_BORDER)
+    wxFLAGS_MEMBER(wxBORDER)
+
+    // standard window styles
+    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
+    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
+    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
+    wxFLAGS_MEMBER(wxWANTS_CHARS)
+    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
+    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
+    wxFLAGS_MEMBER(wxVSCROLL)
+    wxFLAGS_MEMBER(wxHSCROLL)
+
+    wxFLAGS_MEMBER(wxGA_HORIZONTAL)
+    wxFLAGS_MEMBER(wxGA_VERTICAL)
+#if WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxGA_PROGRESSBAR)
+#endif // WXWIN_COMPATIBILITY_2_6
+    wxFLAGS_MEMBER(wxGA_SMOOTH)
+
+wxEND_FLAGS( wxGaugeStyle )
+
+IMPLEMENT_DYNAMIC_CLASS_XTI(wxGauge, wxControl,"wx/gauge.h")
+
+wxBEGIN_PROPERTIES_TABLE(wxGauge95)
+    wxPROPERTY( Value , int , SetValue, GetValue, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( Range , int , SetRange, GetRange, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( ShadowWidth , int , SetShadowWidth, GetShadowWidth, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY( BezelFace , int , SetBezelFace, GetBezelFace, 0 , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
+    wxPROPERTY_FLAGS( WindowStyle , wxGaugeStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+wxEND_PROPERTIES_TABLE()
+
+wxBEGIN_HANDLERS_TABLE(wxGauge95)
+wxEND_HANDLERS_TABLE()
+
+wxCONSTRUCTOR_6( wxGauge95 , wxWindow* , Parent , wxWindowID , Id , int , Range , wxPoint , Position , wxSize , Size , long , WindowStyle )
+#else
+IMPLEMENT_DYNAMIC_CLASS(wxGauge95, wxControl)
+#endif

 
 

-  long msFlags = WS_CHILD | WS_VISIBLE | WS_TABSTOP;
+// ============================================================================
+// wxGauge95 implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxGauge95 creation
+// ----------------------------------------------------------------------------
+
+bool wxGauge95::Create(wxWindow *parent,
+                       wxWindowID id,
+                       int range,
+                       const wxPoint& pos,
+                       const wxSize& size,
+                       long style,
+                       const wxValidator& validator,
+                       const wxString& name)
+{
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return false;

 
 

-  HWND wx_button =
-      CreateWindowEx(MakeExtendedStyle(m_windowStyle), PROGRESS_CLASS, NULL, msFlags,
-                    0, 0, 0, 0, (HWND) parent->GetHWND(), (HMENU)m_windowId,
-                    wxGetInstance(), NULL);
+    if ( !MSWCreateControl(PROGRESS_CLASS, wxEmptyString, pos, size) )
+        return false;

 
 

-  m_hWnd = (WXHWND)wx_button;
+    SetRange(range);

 
 

-  // Subclass again for purposes of dialog editing mode
-  SubclassWin((WXHWND) wx_button);
+    // in case we need to emulate indeterminate mode...
+    m_nDirection = wxRIGHT;

 
 

-  SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, range));
+    return true;
+}

 
 

-  SetFont(* parent->GetFont());
+WXDWORD wxGauge95::MSWGetStyle(long style, WXDWORD *exstyle) const
+{
+    WXDWORD msStyle = wxControl::MSWGetStyle(style, exstyle);

 
 

-  if (width == -1)
-    width = 50;
-  if (height == -1)
-    height = 50;
-  SetSize(x, y, width, height);
+    if ( style & wxGA_VERTICAL )
+        msStyle |= PBS_VERTICAL;

 
 

-  ShowWindow((HWND) GetHWND(), SW_SHOW);
+    if ( style & wxGA_SMOOTH )
+        msStyle |= PBS_SMOOTH;

 
 

-  return TRUE;
+    return msStyle;

 }
 
 }
 

-void wxGauge95::SetSize(const int x, const int y, const int width, const int height, const int sizeFlags)
-{
-  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;
-
-  // 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);
-
-#if WXWIN_COMPATIBILITY
-  GetEventHandler()->OldOnSize(width, height);
-#else
-  wxSizeEvent event(wxSize(width, height), m_windowId);
-  event.eventObject = this;
-  GetEventHandler()->ProcessEvent(event);
-#endif
-}
+// ----------------------------------------------------------------------------
+// wxGauge95 geometry
+// ----------------------------------------------------------------------------

 
 

-void wxGauge95::SetShadowWidth(const int w)
+wxSize wxGauge95::DoGetBestSize() const

 {
 {

+    // VZ: no idea where does 28 come from, it was there before my changes and
+    //     as nobody ever complained I guess we can leave it...
+    if (HasFlag(wxGA_VERTICAL))
+        return wxSize(28, 100);
+    else
+        return wxSize(100, 28);

 }
 
 }
 

-void wxGauge95::SetBezelFace(const int w)
-{
-}
+// ----------------------------------------------------------------------------
+// wxGauge95 setters
+// ----------------------------------------------------------------------------

 
 

-void wxGauge95::SetRange(const int r)
+void wxGauge95::SetRange(int r)

 {
 {

-  m_rangeMax = r;
+    // switch to determinate mode if required
+    SetDeterminateMode();
+
+    m_rangeMax = r;

 
 

-  SendMessage((HWND) GetHWND(), PBM_SETRANGE, 0, MAKELPARAM(0, r));
+#ifdef PBM_SETRANGE32
+    ::SendMessage(GetHwnd(), PBM_SETRANGE32, 0, r);
+#else // !PBM_SETRANGE32
+    // fall back to PBM_SETRANGE (limited to 16 bits)
+    ::SendMessage(GetHwnd(), PBM_SETRANGE, 0, MAKELPARAM(0, r));
+#endif // PBM_SETRANGE32/!PBM_SETRANGE32

 }
 
 }
 

-void wxGauge95::SetValue(const int pos)
+void wxGauge95::SetValue(int pos)

 {
 {

-  m_gaugePos = pos;
+    // switch to determinate mode if required
+    SetDeterminateMode();

 
 

-  SendMessage((HWND) GetHWND(), PBM_SETPOS, pos, 0);
-}
+    m_gaugePos = pos;

 
 

-int wxGauge95::GetShadowWidth(void) const
-{
-  return 0;
+    ::SendMessage(GetHwnd(), PBM_SETPOS, pos, 0);

 }
 
 }
 

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

 {
 {

-  return 0;
+    if ( !wxControl::SetForegroundColour(col) )
+        return false;
+
+    ::SendMessage(GetHwnd(), PBM_SETBARCOLOR, 0, (LPARAM)wxColourToRGB(col));
+
+    return true;

 }
 
 }
 

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

 {
 {

-  return m_rangeMax;
+    if ( !wxControl::SetBackgroundColour(col) )
+        return false;
+
+    ::SendMessage(GetHwnd(), PBM_SETBKCOLOR, 0, (LPARAM)wxColourToRGB(col));
+
+    return true;

 }
 
 }
 

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

 {
 {

-  return m_gaugePos;
+    // add the PBS_MARQUEE style to the progress bar
+    LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ((style & PBS_MARQUEE) == 0)
+        ::SetWindowLong(GetHwnd(), GWL_STYLE, style|PBS_MARQUEE);
+
+    // now the control can only run in indeterminate mode

 }
 
 }
 

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

 {
 {

-  m_foregroundColour = col ;
+    // remove the PBS_MARQUEE style to the progress bar
+    LONG style = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+    if ((style & PBS_MARQUEE) != 0)
+        ::SetWindowLong(GetHwnd(), GWL_STYLE, style & ~PBS_MARQUEE);
+
+    // now the control can only run in determinate mode

 }
 
 }
 

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

 {
 {

-  m_backgroundColour = col ;
+    if (wxApp::GetComCtl32Version() >= 600)
+    {
+        // switch to indeterminate mode if required
+        SetIndeterminateMode();
+
+        // NOTE: when in indeterminate mode, the PBM_SETPOS message will just make
+        //       the bar's blocks move a bit and the WPARAM value is just ignored
+        //       so that we can safely use zero
+        SendMessage(GetHwnd(), (UINT) PBM_SETPOS, (WPARAM)0, (LPARAM)0);
+    }
+    else
+    {
+        // emulate indeterminate mode
+        wxGaugeBase::Pulse();
+    }

 }
 
 }
 

-#endif // USE_GAUGE
+#endif // wxUSE_GAUGE