git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33216
c3d73ce0-8a6f-49c7-b76d-
6d57e0e08775
typedef void * WXHPALETTE;
typedef void * WXHCURSOR;
typedef void * WXHRGN;
typedef void * WXHPALETTE;
typedef void * WXHCURSOR;
typedef void * WXHRGN;
+typedef void * WXRECTPTR;
typedef void * WXHACCEL;
typedef void WXFAR * WXHINSTANCE;
typedef void * WXHBITMAP;
typedef void * WXHACCEL;
typedef void WXFAR * WXHINSTANCE;
typedef void * WXHBITMAP;
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual WXHRGN MSWCalculateClippingRegion();
virtual WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
virtual WXHRGN MSWCalculateClippingRegion();
- virtual void MSWClipBoxRegion(HRGN hrgn, const RECT *rc);
+ virtual void MSWClipBoxRegion(WXHRGN hrgn, const WXRECTPTR rc);
void OnPaint(wxPaintEvent& event);
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
void OnPaint(wxPaintEvent& event);
DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticBox)
}
// rc must be in client coords!
}
// rc must be in client coords!
-void wxStaticBox::MSWClipBoxRegion(HRGN hrgn, const RECT *rc)
+void wxStaticBox::MSWClipBoxRegion(WXHRGN hrgn, const WXRECTPTR rc)
- hrgnchild = ::CreateRectRgn(0, 0, rc->right, 14);
- ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
+ hrgnchild = ::CreateRectRgn(0, 0, ((const RECT*) rc)->right, 14);
+ ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF);
::DeleteObject(hrgnchild);
// bottom
::DeleteObject(hrgnchild);
// bottom
- hrgnchild = ::CreateRectRgn(0, rc->bottom - 7, rc->right, rc->bottom);
- ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
+ hrgnchild = ::CreateRectRgn(0, ((const RECT*) rc)->bottom - 7, ((const RECT*) rc)->right, ((const RECT*) rc)->bottom);
+ ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF);
::DeleteObject(hrgnchild);
// left
::DeleteObject(hrgnchild);
// left
- hrgnchild = ::CreateRectRgn(0, 0, 7, rc->bottom);
- ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
+ hrgnchild = ::CreateRectRgn(0, 0, 7, ((const RECT*) rc)->bottom);
+ ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF);
::DeleteObject(hrgnchild);
// right
::DeleteObject(hrgnchild);
// right
- hrgnchild = ::CreateRectRgn(rc->right - 7, 0, rc->right, rc->bottom);
- ::CombineRgn(hrgn, hrgn, hrgnchild, RGN_DIFF);
+ hrgnchild = ::CreateRectRgn(((const RECT*) rc)->right - 7, 0, ((const RECT*) rc)->right, ((const RECT*) rc)->bottom);
+ ::CombineRgn((HRGN) hrgn, (HRGN) hrgn, hrgnchild, RGN_DIFF);
::DeleteObject(hrgnchild);
}
::DeleteObject(hrgnchild);
}
// paint the inner
HRGN hrgn = (HRGN)MSWCalculateClippingRegion();
// now remove the box itself
// paint the inner
HRGN hrgn = (HRGN)MSWCalculateClippingRegion();
// now remove the box itself
- MSWClipBoxRegion(hrgn, &rc);
+ MSWClipBoxRegion((WXHRGN) hrgn, (const WXRECTPTR) &rc);
hbr = DoMSWControlColor(GetHdcOf(dc), wxNullColour);
if ( !hbr )
hbr = DoMSWControlColor(GetHdcOf(dc), wxNullColour);
if ( !hbr )