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

Build fix for 2.6 compatibility off.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-31 18:26:24 +00:00
parent 1c067fe3c1
commit d879e16fc3
1 changed files with 34 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/os2/scrolbar.cpp
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: scrolbar.cpp
// Name: src/os2/scrolbar.cpp
// Purpose: wxScrollBar
// Author: David Webster
// Modified by:
@@ -13,8 +13,7 @@
#include "wx/wxprec.h"
#ifndef WX_PRECOMP
#include "wx/defs.h"
#include "wx/utils.h"
#include "wx/utils.h"
#endif
#include "wx/scrolbar.h"
@@ -23,17 +22,16 @@
IMPLEMENT_DYNAMIC_CLASS(wxScrollBar, wxControl)
// Scrollbar
bool wxScrollBar::Create (
wxWindow* pParent
, wxWindowID vId
, const wxPoint& rPos
, const wxSize& rSize
, long lStyle
bool wxScrollBar::Create(wxWindow* pParent,
wxWindowID vId,
const wxPoint& rPos,
const wxSize& rSize,
long lStyle,
#if wxUSE_VALIDATORS
, const wxValidator& rValidator
const wxValidator& rValidator,
#endif
, const wxString& rsName
)
const wxString& rsName
)
{
int nX = rPos.x;
int nY = rPos.y;
@@ -41,7 +39,8 @@ bool wxScrollBar::Create (
int nHeight = rSize.y;
if (!pParent)
return FALSE;
return false;
pParent->AddChild(this);
SetName(rsName);
#if wxUSE_VALIDATORS
@@ -50,19 +49,19 @@ bool wxScrollBar::Create (
SetBackgroundColour(pParent->GetBackgroundColour()) ;
SetForegroundColour(pParent->GetForegroundColour()) ;
if (vId == -1L)
if (vId == wxID_ANY)
m_windowId = (int)NewControlId();
else
m_windowId = vId;
if (nWidth == -1)
if (nWidth == wxDefaultCoord)
{
if (lStyle & wxHORIZONTAL)
nWidth = 140;
else
nWidth = 14;
}
if (nHeight == -1)
if (nHeight == wxDefaultCoord)
{
if (lStyle & wxVERTICAL)
nHeight = 140;
@@ -111,7 +110,7 @@ bool wxScrollBar::Create (
,nWidth
,nHeight
);
return TRUE;
return true;
} // end of wxScrollBar::Create
wxScrollBar::~wxScrollBar()
@@ -191,7 +190,7 @@ bool wxScrollBar::OS2OnScroll ( int WXUNUSED(nOrientation),
case SB_ENDSCROLL:
nScrollInc = 0;
vScrollEvent = wxEVT_SCROLL_ENDSCROLL;
vScrollEvent = wxEVT_SCROLL_CHANGED;
break;
default:
@@ -208,7 +207,7 @@ bool wxScrollBar::OS2OnScroll ( int WXUNUSED(nOrientation),
SetThumbPosition(nPosition);
}
else if ( vScrollEvent != wxEVT_SCROLL_THUMBRELEASE &&
vScrollEvent != wxEVT_SCROLL_ENDSCROLL
vScrollEvent != wxEVT_SCROLL_CHANGED
)
{
//