Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include wx/gauge.h according to precompiled headers of wx/wx.h (with other minor cleaning).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-06-06 22:02:01 +00:00
parent b2e178485a
commit 9d2c19f136
10 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/os2/gauge.cpp
View File

@@ -11,13 +11,16 @@
#include "wx/wxprec.h"
#if wxUSE_GAUGE
#include "wx/gauge.h"
#ifndef WX_PRECOMP
#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
@@ -26,22 +29,20 @@ extern void wxAssociateWinWithHandle( HWND hWnd
IMPLEMENT_DYNAMIC_CLASS(wxGauge, wxControl)
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
);
HPS hPS;
RECTL vRect;
RECTL vRect2;
RECTL vRect3;
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 )
{
@@ -129,23 +130,21 @@ MRESULT EXPENTRY wxGaugeWndProc(
);
} // end of wxGaugeWndProc
bool wxGauge::Create(
wxWindowOS2* pParent
, wxWindowID vId
, int nRange
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
, const wxValidator& rValidator
, 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
@@ -160,7 +159,7 @@ bool wxGauge::Create(
m_nGaugePos = 0;
m_windowStyle = lStyle;
if (vId == -1)
if (vId == wxID_ANY)
m_windowId = (int)NewControlId();
else
m_windowId = vId;
@@ -217,7 +216,7 @@ bool wxGauge::Create(
m_nHeight = nHeight;
::WinShowWindow((HWND)GetHWND(), TRUE);
delete pTextFont;
return TRUE;
return true;
} // end of wxGauge::Create
int wxGauge::GetBezelFace() const
@@ -255,9 +254,7 @@ bool wxGauge::SetBackgroundColour( const wxColour& rColour )
return true;
} // end of wxGauge::SetBackgroundColour
void wxGauge::SetBezelFace(
int WXUNUSED(nWidth)
)
void wxGauge::SetBezelFace( int WXUNUSED(nWidth) )
{
} // end of wxGauge::SetBezelFace
@@ -277,24 +274,18 @@ bool wxGauge::SetForegroundColour( const wxColour& rColour )
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);
@@ -305,3 +296,5 @@ wxSize wxGauge::DoGetBestSize() const
{
return wxSize(m_nWidth,m_nHeight);
}
#endif // wxUSE_GAUGE