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

removed WXWIN_COMPATIBILITY and WXWIN_COMPATIBILITY_2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-17 12:50:53 +00:00
parent 4a93ea29b5
commit a3bf7524f3
79 changed files with 12 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
src/os2/window.cpp
View File

@@ -691,81 +691,11 @@ void wxWindowOS2::WarpPointer(
::WinSetPointerPos(HWND_DESKTOP, (LONG)nX, (LONG)(nY));
} // end of wxWindowOS2::WarpPointer
#if WXWIN_COMPATIBILITY
void wxWindowOS2::OS2DeviceToLogical (float *x, float *y) const
{
}
#endif // WXWIN_COMPATIBILITY
// ---------------------------------------------------------------------------
// scrolling stuff
// ---------------------------------------------------------------------------
#if WXWIN_COMPATIBILITY
void wxWindowOS2::SetScrollRange(
int nOrient
, int nRange
, bool bRefresh
)
{
int nRange1 = nRange;
int nPageSize = GetScrollPage(nOrient);
if (nPpageSize > 1 && nRange > 0)
{
nRange1 += (nPageSize - 1);
}
if (nOrient == wxHORIZONTAL)
{
::WinSendMsg(m_hWndScrollBarHorz, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
::WinSendMsg(m_hWndScrollBarHorz, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
}
else
{
::WinSendMsg(m_hWndScrollBarVert, SBM_SETSCROLLBAR, (MPARAM)0, MPFROM2SHORT(0, (SHORT)nRange1));
::WinSendMsg(m_hWndScrollBarVert, SBM_SETTHUMBSIZE, MPFROM2SHORT((SHORT)nThumbVisible, (SHORT)nRange1), (MPARAM)0);
}
} // end of wxWindowOS2::SetScrollRange
void wxWindowOS2::SetScrollPage(
int nOrient
, int nPage
, bool bRefresh
)
{
if (nOrient == wxHORIZONTAL )
m_nXThumbSize = nPage;
else
m_nYThumbSize = nPage;
} // end of wxWindowOS2::SetScrollPage
int wxWindowOS2::OldGetScrollRange(
int nOrient
) const
{
MRESULT mRc;
HWND hWnd = GetHwnd();
if (hWnd)
{
mRc = WinSendMsg(hWnd, SBM_QUERYRANGE, (MPARAM)0L, (MPARAM)0L);
return(SHORT2FROMMR(mRc));
}
return 0;
} // end of wxWindowOS2::OldGetScrollRange
int wxWindowOS2::GetScrollPage(
int nOrient
) const
{
if (nOrient == wxHORIZONTAL)
return m_nXThumbSize;
else
return m_nYThumbSize;
} // end of wxWindowOS2::GetScrollPage
#endif // WXWIN_COMPATIBILITY
int wxWindowOS2::GetScrollPos(
int nOrient
) const
@@ -1277,43 +1207,6 @@ WXDWORD wxWindowOS2::Determine3DEffects(
return dwStyle;
} // end of wxWindowOS2::Determine3DEffects
#if WXWIN_COMPATIBILITY
void wxWindowOS2::OnCommand(
wxWindow& rWin
, wxCommandEvent& rEvent
)
{
if (GetEventHandler()->ProcessEvent(rEvent))
return;
if (m_parent)
m_parent->GetEventHandler()->OnCommand( rWin
,rEvent
);
} // end of wxWindowOS2::OnCommand
wxObject* wxWindowOS2::GetChild(
int nNumber
) const
{
//
// Return a pointer to the Nth object in the Panel
//
wxNode* pNode = GetChildren().First();
int n = nNumber;
while (pNode && n--)
pNode = pNode->Next();
if (pNode)
{
wxObject* pObj = (wxObject*)pNode->Data();
return(pObj);
}
else
return NULL;
} // end of wxWindowOS2::GetChild
#endif // WXWIN_COMPATIBILITY
//
// Setup background and foreground colours correctly
//
@@ -2137,67 +2030,6 @@ bool wxWindowOS2::IsMouseInWindow() const
return hWnd != NULL;
} // end of wxWindowOS2::IsMouseInWindow
#if wxUSE_CARET && WXWIN_COMPATIBILITY
// ---------------------------------------------------------------------------
// Caret manipulation
// ---------------------------------------------------------------------------
void wxWindowOS2::CreateCaret(
int nWidth
, int nHeight
)
{
SetCaret(new wxCaret( this
,nWidth
,nHeight
));
} // end of wxWindowOS2::CreateCaret
void wxWindowOS2::CreateCaret(
const wxBitmap* pBitmap
)
{
wxFAIL_MSG("not implemented");
} // end of wxWindowOS2::CreateCaret
void wxWindowOS2::ShowCaret(
bool bShow
)
{
wxCHECK_RET( m_caret, "no caret to show" );
m_caret->Show(bShow);
} // end of wxWindowOS2::ShowCaret
void wxWindowOS2::DestroyCaret()
{
SetCaret(NULL);
} // end of wxWindowOS2::DestroyCaret
void wxWindowOS2::SetCaretPos(
int nX
, int nY)
{
wxCHECK_RET( m_caret, "no caret to move" );
m_caret->Move( nX
,nY
);
} // end of wxWindowOS2::SetCaretPos
void wxWindowOS2::GetCaretPos(
int* pX
, int* pY
) const
{
wxCHECK_RET( m_caret, "no caret to get position of" );
m_caret->GetPosition( pX
,pY
);
} // end of wxWindowOS2::GetCaretPos
#endif //wxUSE_CARET
// ---------------------------------------------------------------------------
// popup menu