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

Follow changes in common code.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-17 19:51:31 +00:00
parent 22574b4a9c
commit 1a4138c79a
2 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/os2/cursor.cpp
View File

@@ -35,7 +35,7 @@ wxCursorRefData::wxCursorRefData(void)
m_nWidth = 32; m_nWidth = 32;
m_nHeight = 32; m_nHeight = 32;
m_hCursor = 0 ; m_hCursor = 0 ;
m_bDestroyCursor = FALSE; m_bDestroyCursor = false;
} }
void wxCursorRefData::Free() void wxCursorRefData::Free()
@@ -53,39 +53,35 @@ wxCursor::wxCursor(void)
{ {
} }
wxCursor::wxCursor( wxCursor::wxCursor(const char WXUNUSED(bits)[],
const char WXUNUSED(bits)[] int WXUNUSED(width),
, int WXUNUSED(width) int WXUNUSED(height),
, int WXUNUSED(height) int WXUNUSED(hotSpotX),
, int WXUNUSED(hotSpotX) int WXUNUSED(hotSpotY),
, int WXUNUSED(hotSpotY) const char WXUNUSED(maskBits)[])
, const char WXUNUSED(maskBits)[]
)
{ {
} }
wxCursor::wxCursor( wxCursor::wxCursor(const wxImage& rImage)
const wxImage& rImage
)
{ {
wxImage vImage32 = rImage.Scale(32,32); wxImage vImage32 = rImage.Scale(32,32);
int nWidth = vImage32.GetWidth(); int nWidth = vImage32.GetWidth();
int nHeight = vImage32.GetHeight(); int nHeight = vImage32.GetHeight();
// //
// Need a bitmap handle somehow // Need a bitmap handle somehow
// //
HBITMAP hBitmap = wxBitmap(vImage32).GetHBITMAP(); HBITMAP hBitmap = wxBitmap(vImage32).GetHBITMAP();
int nHotSpotX = vImage32.GetOptionInt(wxCUR_HOTSPOT_X); int nHotSpotX = vImage32.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_X);
int nHotSpotY = vImage32.GetOptionInt(wxCUR_HOTSPOT_Y); int nHotSpotY = vImage32.GetOptionInt(wxIMAGE_OPTION_CUR_HOTSPOT_Y);
if (nHotSpotX < 0 || nHotSpotX >= nWidth) if (nHotSpotX < 0 || nHotSpotX >= nWidth)
nHotSpotX = 0; nHotSpotX = 0;
if (nHotSpotY < 0 || nHotSpotY >= nHeight) if (nHotSpotY < 0 || nHotSpotY >= nHeight)
nHotSpotY = 0; nHotSpotY = 0;
wxCursorRefData* pRefData = new wxCursorRefData; wxCursorRefData* pRefData = new wxCursorRefData;
m_refData = pRefData; m_refData = pRefData;
pRefData->m_hCursor = (WXHCURSOR) ::WinCreatePointer( HWND_DESKTOP pRefData->m_hCursor = (WXHCURSOR) ::WinCreatePointer( HWND_DESKTOP
@@ -106,7 +102,7 @@ wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
pRefData = new wxCursorRefData; pRefData = new wxCursorRefData;
m_refData = pRefData; m_refData = pRefData;
pRefData->m_bDestroyCursor = FALSE; pRefData->m_bDestroyCursor = false;
if (lFlags == wxBITMAP_TYPE_CUR_RESOURCE) if (lFlags == wxBITMAP_TYPE_CUR_RESOURCE)
{ {
pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP pRefData->m_hCursor = (WXHCURSOR) ::WinLoadPointer( HWND_DESKTOP
@@ -117,9 +113,7 @@ wxCursor::wxCursor( const wxString& WXUNUSED(rsCursorFile),
} // end of wxCursor::wxCursor } // end of wxCursor::wxCursor
// Cursors by stock number // Cursors by stock number
wxCursor::wxCursor( wxCursor::wxCursor(int nCursorType)
int nCursorType
)
{ {
wxCursorRefData* pRefData = new wxCursorRefData; wxCursorRefData* pRefData = new wxCursorRefData;
@@ -306,7 +300,7 @@ wxCursor::wxCursor(
// //
// No need to destroy the stock cursors // No need to destroy the stock cursors
// //
((wxCursorRefData *)m_refData)->m_bDestroyCursor = FALSE; ((wxCursorRefData *)m_refData)->m_bDestroyCursor = false;
} // end of wxCursor::wxCursor } // end of wxCursor::wxCursor
// Global cursor setting // Global cursor setting

28
src/os2/window.cpp
View File

@@ -410,9 +410,7 @@ bool wxWindowOS2::Create( wxWindow* pParent,
pParent->AddChild(this); pParent->AddChild(this);
hParent = GetWinHwnd(pParent); hParent = GetWinHwnd(pParent);
if ( pParent->IsKindOf(CLASSINFO(wxGenericScrolledWindow)) || if (pParent->IsKindOf(CLASSINFO(wxScrolledWindow)))
pParent->IsKindOf(CLASSINFO(wxScrolledWindow))
)
ulCreateFlags |= WS_CLIPSIBLINGS; ulCreateFlags |= WS_CLIPSIBLINGS;
} }
@@ -1577,9 +1575,7 @@ void wxWindowOS2::DoMoveWindow(
// which will cause the scrollbars to be displayed via the SetScrollbar // which will cause the scrollbars to be displayed via the SetScrollbar
// call in CWindow. // call in CWindow.
// //
if ( IsKindOf(CLASSINFO(wxGenericScrolledWindow)) || if (IsKindOf(CLASSINFO(wxScrolledWindow)))
IsKindOf(CLASSINFO(wxScrolledWindow))
)
{ {
int nAdjustWidth = 0; int nAdjustWidth = 0;
int nAdjustHeight = 0; int nAdjustHeight = 0;
@@ -3824,14 +3820,12 @@ bool wxWindowOS2::HandleEraseBkgnd( WXHDC hDC )
return true; return true;
} // end of wxWindowOS2::HandleEraseBkgnd } // end of wxWindowOS2::HandleEraseBkgnd
void wxWindowOS2::OnEraseBackground( void wxWindowOS2::OnEraseBackground(wxEraseEvent& rEvent)
wxEraseEvent& rEvent
)
{ {
RECTL vRect; RECTL vRect;
HPS hPS = rEvent.m_dc->m_hPS; HPS hPS = rEvent.GetDC()->GetHPS();
APIRET rc; APIRET rc;
LONG lColor = m_backgroundColour.GetPixel(); LONG lColor = m_backgroundColour.GetPixel();
rc = ::WinQueryWindowRect(GetHwnd(), &vRect); rc = ::WinQueryWindowRect(GetHwnd(), &vRect);
rc = ::WinFillRect(hPS, &vRect, lColor); rc = ::WinFillRect(hPS, &vRect, lColor);
@@ -5167,16 +5161,12 @@ static void TranslateKbdEventToMouse(
// Find the wxWindow at the current mouse position, returning the mouse // Find the wxWindow at the current mouse position, returning the mouse
// position. // position.
wxWindow* wxFindWindowAtPointer( wxWindow* wxFindWindowAtPointer(wxPoint& WXUNUSED(rPt))
wxPoint& WXUNUSED(rPt)
)
{ {
return wxFindWindowAtPoint(wxGetMousePosition()); return wxFindWindowAtPoint(wxGetMousePosition());
} }
wxWindow* wxFindWindowAtPoint( wxWindow* wxFindWindowAtPoint(const wxPoint& rPt)
const wxPoint& rPt
)
{ {
POINTL vPt2; POINTL vPt2;