projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Translated a double click into just a second click for Scintilla
[wxWidgets.git]
/
src
/
mac
/
region.cpp
diff --git
a/src/mac/region.cpp
b/src/mac/region.cpp
index c5c6332e06fbd1c45a0f00372d4a252a2f3aadce..315b966927af0e6d304a99617f9fa65bdb14a3fd 100644
(file)
--- a/
src/mac/region.cpp
+++ b/
src/mac/region.cpp
@@
-14,6
+14,7
@@
#include "wx/region.h"
#include "wx/gdicmn.h"
#include "wx/region.h"
#include "wx/gdicmn.h"
+#include "wx/mac/uma.h"
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
#if !USE_SHARED_LIBRARY
IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
@@
-193,11
+194,12
@@
bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
//-----------------------------------------------------------------------------
// Outer bounds of region
//-----------------------------------------------------------------------------
// Outer bounds of region
-void wxRegion::GetBox(
long& x, long& y, long&w, long &
h) const
+void wxRegion::GetBox(
wxCoord& x, wxCoord& y, wxCoord& w, wxCoord&
h) const
{
if (m_refData)
{
{
if (m_refData)
{
- Rect box = (**M_REGION).rgnBBox ;
+ Rect box ;
+ GetRegionBounds( M_REGION , &box ) ;
x = box.left ;
y = box.top ;
w = box.right - box.left ;
x = box.left ;
y = box.top ;
w = box.right - box.left ;
@@
-211,7
+213,7
@@
void wxRegion::GetBox(long& x, long& y, long&w, long &h) const
wxRect wxRegion::GetBox() const
{
wxRect wxRegion::GetBox() const
{
-
long
x, y, w, h;
+
wxCoord
x, y, w, h;
GetBox(x, y, w, h);
return wxRect(x, y, w, h);
}
GetBox(x, y, w, h);
return wxRect(x, y, w, h);
}
@@
-331,7
+333,8
@@
void wxRegionIterator::Reset(const wxRegion& region)
{
// we cannot dissolve it into rects on mac
m_rects = new wxRect[1];
{
// we cannot dissolve it into rects on mac
m_rects = new wxRect[1];
- Rect rect = (**OTHER_M_REGION( region )).rgnBBox ;
+ Rect rect ;
+ GetRegionBounds( OTHER_M_REGION( region ) , &rect ) ;
m_rects[0].x = rect.left;
m_rects[0].y = rect.top;
m_rects[0].width = rect.right - rect.left;
m_rects[0].x = rect.left;
m_rects[0].y = rect.top;
m_rects[0].width = rect.right - rect.left;