Fixed wxMessageBox with only an OK button returning wxCANCEL under MSW.

[wxWidgets.git] / src / palmos / region.cpp

diff --git a/src/palmos/region.cpp b/src/palmos/region.cpp
index 64e726b9977b395d8d0dbdbb708a450dda9a0268..4ac54e01654d4cea2844ce7a479c492bf0f055d7 100644 (file)
--- a/src/palmos/region.cpp
+++ b/src/palmos/region.cpp
@@ -21,12 +21,14 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #include "wx/region.h"
 
 #endif
 
 #include "wx/region.h"
 

-#include "wx/gdicmn.h"
+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif

 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)
 
 IMPLEMENT_DYNAMIC_CLASS(wxRegion, wxGDIObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator, wxObject)


@@ -63,7 +65,7 @@ wxRegion::wxRegion(const wxRect& rect)
 {
 }
 
 {
 }
 

-wxRegion::wxRegion(size_t n, const wxPoint *points, int fillStyle)
+wxRegion::wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle)

 {
 }
 
 {
 }
 


@@ -71,12 +73,12 @@ wxRegion::~wxRegion()
 {
 }
 
 {
 }
 

-wxObjectRefData *wxRegion::CreateRefData() const
+wxGDIRefData *wxRegion::CreateGDIRefData() const

 {
     return NULL;
 }
 
 {
     return NULL;
 }
 

-wxObjectRefData *wxRegion::CloneRefData(const wxObjectRefData *data) const
+wxGDIRefData *wxRegion::CloneGDIRefData(const wxGDIRefData *data) const

 {
     return NULL;
 }
 {
     return NULL;
 }


@@ -90,26 +92,13 @@ void wxRegion::Clear()
 {
 }
 
 {
 }
 

-bool wxRegion::Offset(wxCoord x, wxCoord y)
+bool wxRegion::DoOffset(wxCoord x, wxCoord y)

 {
     return false;
 }
 
 // combine another region with this one
 {
     return false;
 }
 
 // combine another region with this one

-bool wxRegion::Combine(const wxRegion& rgn, wxRegionOp op)
-{
-    return false;
-}
-
-// Combine rectangle (x, y, w, h) with this.
-bool wxRegion::Combine(wxCoord x, wxCoord y,
-                       wxCoord width, wxCoord height,
-                       wxRegionOp op)
-{
-    return false;
-}
-
-bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
+bool wxRegion::DoCombine(const wxRegion& rgn, wxRegionOp op)

 {
     return false;
 }
 {
     return false;
 }


@@ -119,19 +108,20 @@ bool wxRegion::Combine(const wxRect& rect, wxRegionOp op)
 // ----------------------------------------------------------------------------
 
 // Outer bounds of region
 // ----------------------------------------------------------------------------
 
 // Outer bounds of region

-void wxRegion::GetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const
+bool wxRegion::DoGetBox(wxCoord& x, wxCoord& y, wxCoord&w, wxCoord &h) const

 {
 {

+    return false;

 }
 
 }
 

-wxRect wxRegion::GetBox() const
+// Is region empty?
+bool wxRegion::IsEmpty() const

 {
 {

-    return wxRect(0, 0, 0, 0);
+    return true;

 }
 
 }
 

-// Is region empty?
-bool wxRegion::Empty() const
+bool wxRegion::DoIsEqual(const wxRegion& region) const

 {
 {

-    return true;
+    return false;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -139,26 +129,13 @@ bool wxRegion::Empty() const
 // ----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?
 // ----------------------------------------------------------------------------
 
 // Does the region contain the point (x,y)?

-wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y) const
-{
-    return wxOutRegion;
-}
-
-// Does the region contain the point pt?
-wxRegionContain wxRegion::Contains(const wxPoint& pt) const
-{
-    return wxOutRegion;
-}
-
-// Does the region contain the rectangle (x, y, w, h)?
-wxRegionContain wxRegion::Contains(wxCoord x, wxCoord y,
-                                   wxCoord w, wxCoord h) const
+wxRegionContain wxRegion::DoContainsPoint(wxCoord x, wxCoord y) const

 {
     return wxOutRegion;
 }
 
 // Does the region contain the rectangle rect
 {
     return wxOutRegion;
 }
 
 // Does the region contain the rectangle rect

-wxRegionContain wxRegion::Contains(const wxRect& rect) const
+wxRegionContain wxRegion::DoContainsRect(const wxRect& rect) const

 {
     return wxOutRegion;
 }
 {
     return wxOutRegion;
 }