/////////////////////////////////////////////////////////////////////////////
-// Name: gauge.cpp
+// Name: src/os2/gauge.cpp
// Purpose: wxGauge class
// Author: David Webster
// Modified by:
#include "wx/wxprec.h"
+#if wxUSE_GAUGE
+
+#include "wx/gauge.h"
+
#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/scrolwin.h"
+ #include "wx/utils.h"
+ #include "wx/scrolwin.h"
#endif
#include "wx/os2/private.h"
-#include "wx/gauge.h"
static WXFARPROC fnWndProcGauge = (WXFARPROC)NULL;
extern void wxAssociateWinWithHandle( HWND hWnd
,wxWindowOS2* pWin
);
-IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxGaugeBase)
-MRESULT EXPENTRY wxGaugeWndProc(
- HWND hWnd
-, UINT uMessage
-, MPARAM wParam
-, MPARAM lParam
-)
+MRESULT EXPENTRY wxGaugeWndProc( HWND hWnd,
+ UINT uMessage,
+ MPARAM wParam,
+ MPARAM lParam )
{
wxGauge* pGauge = (wxGauge *)::WinQueryWindowULong( hWnd
,QWL_USER
);
- wxWindowOS2* pWindow = NULL;
- MRESULT rc = (MRESULT)0;
- bool bProcessed = FALSE;
- HPS hPS;
- RECTL vRect;
- RECTL vRect2;
- double dPixelToRange = 0.0;
- double dRange = 0.0;
+ HPS hPS;
+ RECTL vRect;
+ RECTL vRect2;
+ RECTL vRect3;
+ double dPixelToRange = 0.0;
+ double dRange = 0.0;
switch (uMessage )
{
,0L
,NULL
);
+ //
+ // Draw the guage box
+ //
+ LONG lColor = 0x00FFFFFF; // White
+ POINTL vPoint = {vRect.xLeft + 1, vRect.yBottom + 1};
+
+ ::GpiSetColor(hPS, lColor);
+ ::GpiMove(hPS, &vPoint);
+ vPoint.x = vRect.xRight - 1;
+ ::GpiLine(hPS, &vPoint);
+ vPoint.y = vRect.yTop - 1;
+ ::GpiLine(hPS, &vPoint);
+ lColor = 0x000C0C0C; // Darkish Grey to give depth feel
+ ::GpiSetColor(hPS, lColor);
+ vPoint.x = vRect.xLeft + 1;
+ ::GpiLine(hPS, &vPoint);
+ vPoint.y = vRect.yBottom + 1;
+ ::GpiLine(hPS, &vPoint);
+ vRect3.xLeft = vRect.xLeft + 2;
+ vRect3.xRight = vRect.xRight - 2;
+ vRect3.yTop = vRect.yTop - 2;
+ vRect3.yBottom = vRect.yBottom + 2;
+
if (pGauge->GetWindowStyleFlag() & wxGA_VERTICAL)
{
- dRange = (double)(vRect.yTop - vRect.yBottom);
+ dRange = (double)(vRect3.yTop - vRect3.yBottom);
dPixelToRange = dRange/(double)pGauge->GetRange();
vRect2.yTop = (int)(pGauge->GetValue() * dPixelToRange);
- vRect2.yBottom = vRect.yBottom;
- vRect2.xLeft = vRect.xLeft;
- vRect2.xRight = vRect.xRight;
- vRect.yBottom = vRect2.yTop;
- ::WinFillRect(hPS, &vRect, pGauge->GetBackgroundColour().GetPixel());
+ vRect2.yBottom = vRect3.yBottom;
+ vRect2.xLeft = vRect3.xLeft;
+ vRect2.xRight = vRect3.xRight;
+ vRect3.yBottom = vRect2.yTop;
+ if (vRect3.yBottom <= 1)
+ vRect3.yBottom = 2;
+ ::WinFillRect(hPS, &vRect3, pGauge->GetBackgroundColour().GetPixel());
::WinFillRect(hPS, &vRect2, pGauge->GetForegroundColour().GetPixel());
}
else
{
- dRange = (double)(vRect.xRight - vRect.xLeft);
+ dRange = (double)(vRect3.xRight - vRect3.xLeft);
dPixelToRange = dRange/(double)pGauge->GetRange();
- vRect2.yTop = vRect.yTop;
- vRect2.yBottom = vRect.yBottom;
- vRect2.xLeft = vRect.xLeft;
+ vRect2.yTop = vRect3.yTop;
+ vRect2.yBottom = vRect3.yBottom;
+ vRect2.xLeft = vRect3.xLeft;
vRect2.xRight = (int)(pGauge->GetValue() * dPixelToRange);
- vRect.xLeft = vRect2.xRight;
- ::WinFillRect(hPS, &vRect, pGauge->GetBackgroundColour().GetPixel());
+ vRect3.xLeft = vRect2.xRight;
+ if (vRect3.xLeft <= 1)
+ vRect3.xLeft = 2;
+ ::WinFillRect(hPS, &vRect3, pGauge->GetBackgroundColour().GetPixel());
::WinFillRect(hPS, &vRect2, pGauge->GetForegroundColour().GetPixel());
}
::WinEndPaint(hPS);
);
} // end of wxGaugeWndProc
-bool wxGauge::Create(
- wxWindowOS2* pParent
-, wxWindowID vId
-, int nRange
-, const wxPoint& rPos
-, const wxSize& rSize
-, long lStyle
-#if wxUSE_VALIDATORS
-, const wxValidator& rValidator
-#endif
-, const wxString& rsName
-)
+bool wxGauge::Create( wxWindowOS2* pParent,
+ wxWindowID vId,
+ int nRange,
+ const wxPoint& rPos,
+ const wxSize& rSize,
+ long lStyle,
+ const wxValidator& rValidator,
+ const wxString& rsName )
{
- int nX = rPos.x;
- int nY = rPos.y;
- int nWidth = rSize.x;
- int nHeight = rSize.y;
- long lMsStyle = 0L;
- SWP vSwp;
+ int nX = rPos.x;
+ int nY = rPos.y;
+ int nWidth = rSize.x;
+ int nHeight = rSize.y;
+ long lMsStyle = 0L;
+ SWP vSwp;
SetName(rsName);
#if wxUSE_VALIDATORS
#endif
if (pParent)
pParent->AddChild(this);
- SetBackgroundColour(pParent->GetBackgroundColour()) ;
- SetForegroundColour(pParent->GetForegroundColour()) ;
+ m_backgroundColour.Set(wxString(wxT("LIGHT GREY")));
+ m_foregroundColour.Set(wxString(wxT("NAVY")));
m_nRangeMax = nRange;
m_nGaugePos = 0;
m_windowStyle = lStyle;
- if (vId == -1)
+ if (vId == wxID_ANY)
m_windowId = (int)NewControlId();
else
m_windowId = vId;
,nWidth
,nHeight
);
+ m_nWidth = nWidth; // Save for GetBestSize
+ m_nHeight = nHeight;
::WinShowWindow((HWND)GetHWND(), TRUE);
delete pTextFont;
- return TRUE;
+ return true;
} // end of wxGauge::Create
int wxGauge::GetBezelFace() const
return m_nGaugePos;
} // end of wxGauge::GetValue
-bool wxGauge::SetBackgroundColour(
- const wxColour& rColour
-)
+bool wxGauge::SetBackgroundColour( const wxColour& rColour )
{
if (!wxControl::SetBackgroundColour(rColour))
- return FALSE;
+ return false;
LONG lColor = (LONG)rColour.GetPixel();
,sizeof(LONG)
,(PVOID)&lColor
);
- return TRUE;
+ return true;
} // end of wxGauge::SetBackgroundColour
-void wxGauge::SetBezelFace(
- int WXUNUSED(nWidth)
-)
+void wxGauge::SetBezelFace( int WXUNUSED(nWidth) )
{
} // end of wxGauge::SetBezelFace
-bool wxGauge::SetForegroundColour(
- const wxColour& rColour
-)
+bool wxGauge::SetForegroundColour( const wxColour& rColour )
{
if (!wxControl::SetForegroundColour(rColour))
- return FALSE;
+ return false;
- LONG lColor = (LONG)rColour.GetPixel();
+ LONG lColor = (LONG)rColour.GetPixel();
::WinSetPresParam( GetHwnd()
,PP_FOREGROUNDCOLOR
,(PVOID)&lColor
);
- return TRUE;
+ return true;
} // end of wxGauge::SetForegroundColour
-void wxGauge::SetRange(
- int nRange
-)
+void wxGauge::SetRange( int nRange )
{
m_nRangeMax = nRange;
} // end of wxGauge::SetRange
-void wxGauge::SetShadowWidth(
- int WXUNUSED(nWidth)
-)
+void wxGauge::SetShadowWidth( int WXUNUSED(nWidth) )
{
} // end of wxGauge::SetShadowWidth
-void wxGauge::SetValue(
- int nPos
-)
+void wxGauge::SetValue( int nPos )
{
- RECT vRect;
+ RECT vRect;
m_nGaugePos = nPos;
::WinQueryWindowRect(GetHwnd(), &vRect);
::WinInvalidateRect(GetHwnd(), &vRect, FALSE);
} // end of wxGauge::SetValue
+wxSize wxGauge::DoGetBestSize() const
+{
+ return wxSize(m_nWidth,m_nHeight);
+}
+#endif // wxUSE_GAUGE
projects / wxWidgets.git / blobdiff