Changed wxRectangle to wxRect. Sorry for the bandwidth...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/event.h b/include/wx/event.h
index 327b2bdfc5aeef3aac7727543b522422f124b482..a99125394e5f1c521a0909ad5f6baccf8a42f358 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -476,7 +476,7 @@ class WXDLLEXPORT wxMouseEvent: public wxEvent
   inline bool RightIsDown(void) const { return m_rightDown; }
 
   // True if a button is down and the mouse is moving
-  inline bool Dragging(void) const { return ((m_eventType == wxEVENT_TYPE_MOTION) && (LeftIsDown() || MiddleIsDown() || RightIsDown())); }
+  inline bool Dragging(void) const { return ((m_eventType == wxEVT_MOTION) && (LeftIsDown() || MiddleIsDown() || RightIsDown())); }
 
   // True if the mouse is moving, and no button is down
   inline bool Moving(void) const { return (m_eventType == wxEVT_MOTION); }

diff --git a/include/wx/generic/colrdlgg.h b/include/wx/generic/colrdlgg.h
index 23fac19e1a07133fe668f677b0b352d7b1646c0d..b54d4df0fda6ef4258625f4487b1f2bfc499bb89 100644 (file)
--- a/include/wx/generic/colrdlgg.h
+++ b/include/wx/generic/colrdlgg.h
@@ -35,9 +35,9 @@ class WXDLLEXPORT wxGenericColourDialog: public wxDialog
   wxWindow *dialogParent;
 
   // Area reserved for grids of colours
-  wxRectangle standardColoursRect;
-  wxRectangle customColoursRect;
-  wxRectangle singleCustomColourRect;
+  wxRect standardColoursRect;
+  wxRect customColoursRect;
+  wxRect singleCustomColourRect;
 
   // Size of each colour rectangle
   wxIntPoint smallRectangleSize;

diff --git a/include/wx/generic/fontdlgg.h b/include/wx/generic/fontdlgg.h
index c8a6e76c0983e4b2042236a01288d3af121014da..6bb9b29fa7e4d7869802bf3880b70a19ea831456 100644 (file)
--- a/include/wx/generic/fontdlgg.h
+++ b/include/wx/generic/fontdlgg.h
@@ -46,7 +46,7 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
   wxWindow *dialogParent;
 
   // Area reserved for font display
-  wxRectangle fontRect;
+  wxRect fontRect;
 
   wxChoice *familyChoice;
   wxChoice *styleChoice;

diff --git a/include/wx/generic/gridg.h b/include/wx/generic/gridg.h
index 22888e74560682556b19f4a7cd36b508fd4387c1..4fa80a339b362c7db08b874cadaa1864b4c0e0dd 100644 (file)
--- a/include/wx/generic/gridg.h
+++ b/include/wx/generic/gridg.h
@@ -139,7 +139,7 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
   inline wxScrollBar *GetVertScrollBar(void) { return m_vScrollBar; }
   inline bool GetEditable(void) { return m_editable; }
   void SetEditable(bool edit);
-  inline wxRectangle& GetCurrentRect(void) { return m_currentRect; }
+  inline wxRect& GetCurrentRect(void) { return m_currentRect; }
   inline bool CurrentCellVisible(void) { return m_currentRectVisible; }
   inline void SetDividerPen(wxPen *pen) { m_divisionPen = pen; }
   inline wxPen *GetDividerPen(void) { return m_divisionPen; }
@@ -200,14 +200,14 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
   virtual void DrawEditableArea(wxDC *dc);
   virtual void DrawGridLines(wxDC *dc);
   virtual void DrawColumnLabels(wxDC *dc);
-  virtual void DrawColumnLabel(wxDC *dc, wxRectangle *rect, int col);
+  virtual void DrawColumnLabel(wxDC *dc, wxRect *rect, int col);
   virtual void DrawRowLabels(wxDC *dc);
-  virtual void DrawRowLabel(wxDC *dc, wxRectangle *rect, int row);
+  virtual void DrawRowLabel(wxDC *dc, wxRect *rect, int row);
   virtual void DrawCells(wxDC *dc);
-  virtual void DrawCellValue(wxDC *dc, wxRectangle *rect, int row, int col);
-  virtual void DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int col);
-  virtual void DrawTextRect(wxDC *dc, const wxString& text, wxRectangle *rect, int flag);
-  virtual void DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRectangle *rect, int flag);
+  virtual void DrawCellValue(wxDC *dc, wxRect *rect, int row, int col);
+  virtual void DrawCellBackground(wxDC *dc, wxRect *rect, int row, int col);
+  virtual void DrawTextRect(wxDC *dc, const wxString& text, wxRect *rect, int flag);
+  virtual void DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRect *rect, int flag);
 
   // Refresh cell and optionally set the text field
   void RefreshCell(int row, int col, bool setText = FALSE);
@@ -227,7 +227,7 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
   wxScrollBar*              m_vScrollBar;
   int                       m_wCursorRow;
   int                       m_wCursorColumn;
-  wxRectangle               m_currentRect;
+  wxRect               m_currentRect;
   bool                      m_currentRectVisible;
   wxGridCell***             m_gridCells;
   wxGridCell**              m_rowLabelCells;
@@ -271,7 +271,7 @@ class WXDLLEXPORT wxGenericGrid: public wxPanel
   wxBitmap*                 m_doubleBufferingBitmap;
 
   // Position of Edit control
-  wxRectangle               m_editControlPosition;
+  wxRect               m_editControlPosition;
 
   // Drag status
   int                       m_dragStatus;

diff --git a/include/wx/generic/statusbr.h b/include/wx/generic/statusbr.h
index d6a6909b0f90e89a27c7dc1d496c6b70e25d6f7a..19717e78f474eaf650387e3c5e3a80ecde329b4a 100644 (file)
--- a/include/wx/generic/statusbr.h
+++ b/include/wx/generic/statusbr.h
@@ -58,7 +58,7 @@ public:
   virtual void DrawField(wxDC& dc, int i);
 
   // Get the position and size of the field's internal bounding rectangle
-  virtual bool GetFieldRect(int i, wxRectangle& rect) const;
+  virtual bool GetFieldRect(int i, wxRect& rect) const;
 
   inline int GetBorderX() const { return m_borderX; }
   inline int GetBorderY() const { return m_borderY; }

diff --git a/include/wx/generic/tabg.h b/include/wx/generic/tabg.h
index 2fb6dcc27a2e2e9c64e1901be3e0310a30f28446..948d55c5935ffefd8a1ea2cad3f3181e3645b132 100644 (file)
--- a/include/wx/generic/tabg.h
+++ b/include/wx/generic/tabg.h
@@ -152,7 +152,7 @@ public:
   inline wxPen *GetBackgroundPen(void) const { return m_backgroundPen; }
   inline wxBrush *GetBackgroundBrush(void) const { return m_backgroundBrush; }
   
-  inline void SetViewRect(const wxRectangle& rect) { m_tabViewRect = rect; }
+  inline void SetViewRect(const wxRect& rect) { m_tabViewRect = rect; }
   inline wxRect GetViewRect(void) const { return m_tabViewRect; }
   
   // Calculate tab width to fit to view, and optionally adjust the view

diff --git a/include/wx/gtk/dcscreen.h b/include/wx/gtk/dcscreen.h
index c2be00de89cfd4c3a49044c04863f4739e41de84..34a90bc5997dfc1dadc1af55fbdde9ecc5a29eb7 100644 (file)
--- a/include/wx/gtk/dcscreen.h
+++ b/include/wx/gtk/dcscreen.h
@@ -31,7 +31,7 @@ public:
   ~wxScreenDC(void);
 
   static bool StartDrawingOnTop( wxWindow *window );
-  static bool StartDrawingOnTop( wxRectangle *rect = (wxRectangle *) NULL );
+  static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
   static bool EndDrawingOnTop(void);
   
   // implementation

diff --git a/include/wx/gtk1/dcscreen.h b/include/wx/gtk1/dcscreen.h
index c2be00de89cfd4c3a49044c04863f4739e41de84..34a90bc5997dfc1dadc1af55fbdde9ecc5a29eb7 100644 (file)
--- a/include/wx/gtk1/dcscreen.h
+++ b/include/wx/gtk1/dcscreen.h
@@ -31,7 +31,7 @@ public:
   ~wxScreenDC(void);
 
   static bool StartDrawingOnTop( wxWindow *window );
-  static bool StartDrawingOnTop( wxRectangle *rect = (wxRectangle *) NULL );
+  static bool StartDrawingOnTop( wxRect *rect = (wxRect *) NULL );
   static bool EndDrawingOnTop(void);
   
   // implementation

diff --git a/include/wx/motif/listctrl.h b/include/wx/motif/listctrl.h
index 5dd61342e94c1a2debd8ce12b21a876c643a1c2e..8cee50cf235e3f17b9757d6e2b71ade1dcafeb8b 100644 (file)
--- a/include/wx/motif/listctrl.h
+++ b/include/wx/motif/listctrl.h
@@ -241,7 +241,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   bool SetItemData(long item, long data) ;
 
   // Gets the item rectangle
-  bool GetItemRect(long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS) const ;
+  bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 
   // Gets the item position
   bool GetItemPosition(long item, wxPoint& pos) const ;

diff --git a/include/wx/motif/treectrl.h b/include/wx/motif/treectrl.h
index 4a20b0cb8b04dcfea1e5c33ad4fcfc882c53d8bf..53ea01438edd0e96567ca857471869b1d6942a01 100644 (file)
--- a/include/wx/motif/treectrl.h
+++ b/include/wx/motif/treectrl.h
@@ -190,7 +190,7 @@ public:
     }
 
       // bounding rect
-    bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
+    bool GetItemRect(long item, wxRect& rect, bool textOnly = FALSE) const;
       //
     wxTextCtrl* GetEditControl() const;
     

diff --git a/include/wx/motif/window.h b/include/wx/motif/window.h
index d9010156f48f04fd37de9b0e96caf5b06cde979d..f11c73e389f37c2f1d9174c09f4a87ace4a4355a 100644 (file)
--- a/include/wx/motif/window.h
+++ b/include/wx/motif/window.h
@@ -53,7 +53,7 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxColourMap;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxRectangle;
+class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxList;
@@ -269,7 +269,7 @@ public:
   virtual bool PopupMenu(wxMenu *menu, int x, int y);
 
   // Send the window a refresh event
-  virtual void Refresh(bool eraseBack = TRUE, const wxRectangle *rect = NULL);
+  virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
 
   // New functions that will replace the above.
   virtual void SetScrollbar(int orient, int pos, int thumbVisible,
@@ -280,7 +280,7 @@ public:
   virtual int GetScrollRange(int orient) const;
   virtual int GetScrollThumb(int orient) const;
 
-  virtual void ScrollWindow(int dx, int dy, const wxRectangle *rect = NULL);
+  virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
 
   // Caret manipulation
   virtual void CreateCaret(int w, int h);
@@ -622,7 +622,7 @@ public:
   // For double-click detection
   long                  m_lastTS;      // last timestamp
   int                   m_lastButton;  // last pressed button
-  wxList                m_updateRects;     // List of wxRectangles representing damaged region
+  wxList                m_updateRects;     // List of wxRects representing damaged region
   bool                  m_isShown;
 protected:
   WXWidget              m_mainWidget;

diff --git a/include/wx/msw/dcscreen.h b/include/wx/msw/dcscreen.h
index c3b75bd02bef4e69d9a87197632836c78d5bf616..67a0cbd95e6203d32f4ac41341060d861653c767 100644 (file)
--- a/include/wx/msw/dcscreen.h
+++ b/include/wx/msw/dcscreen.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC
   // Compatibility with X's requirements for
   // drawing on top of all windows
   static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
-  static bool StartDrawingOnTop(wxRectangle* WXUNUSED(rect) = NULL) { return TRUE; }
+  static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
   static bool EndDrawingOnTop(void) { return TRUE; }
 };
 

diff --git a/include/wx/msw/listctrl.h b/include/wx/msw/listctrl.h
index 0677ecd2bec920d3122461ebe8be2e8f39485e82..ff52f6a80af6dbbc2de98e5db29bb4f3876fc63b 100644 (file)
--- a/include/wx/msw/listctrl.h
+++ b/include/wx/msw/listctrl.h
@@ -258,7 +258,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   bool SetItemData(long item, long data) ;
 
   // Gets the item rectangle
-  bool GetItemRect(long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS) const ;
+  bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 
   // Gets the item position
   bool GetItemPosition(long item, wxPoint& pos) const ;

diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h
index 27ab5a75629cf6e6edad0afd6b6799552817b6ee..716be9607336d69b5953e01db9180fac90b81a34 100644 (file)
--- a/include/wx/msw/treectrl.h
+++ b/include/wx/msw/treectrl.h
@@ -22,6 +22,11 @@
 #include "wx/control.h"
 #include "wx/event.h"
 
+#ifdef __MINGW32__
+#undef GetFirstChild()
+#undef GetNextSibling()
+#endif
+
 // the type for "untyped" data
 typedef long wxDataType;
 
@@ -388,7 +393,7 @@ public:
         // get the bounding rectangle of the item (or of its label only)
         // @@@ do we really need to expose this functions to the application?
     void GetBoundingRect(const wxTreeItemId& item,
-                         wxRectangle& rect,
+                         wxRect& rect,
                          bool textOnly = FALSE) const;
 
     // deprecated

diff --git a/include/wx/qt/dcscreen.h b/include/wx/qt/dcscreen.h
index 12d4996e706eb64e599fc519b860cdc79fd977ea..27961a1caa0369e6a2387876d5aa418415dea8aa 100644 (file)
--- a/include/wx/qt/dcscreen.h
+++ b/include/wx/qt/dcscreen.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxScreenDC: public wxPaintDC
   // Compatibility with X's requirements for
   // drawing on top of all windows
   static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
-  static bool StartDrawingOnTop(wxRectangle* WXUNUSED(rect) = NULL) { return TRUE; }
+  static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
   static bool EndDrawingOnTop() { return TRUE; }
 };
 

diff --git a/include/wx/qt/window.h b/include/wx/qt/window.h
index 802f4d92fa9eb27c3e3bbe8898f399025a17964f..cac783dfc409537bab4fff75a5cb6b85c6750bb3 100644 (file)
--- a/include/wx/qt/window.h
+++ b/include/wx/qt/window.h
@@ -52,7 +52,7 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxColourMap;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxRectangle;
+class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxList;
@@ -227,7 +227,7 @@ public:
   virtual bool PopupMenu(wxMenu *menu, int x, int y);
 
   // Send the window a refresh event
-  virtual void Refresh(bool eraseBack = TRUE, const wxRectangle *rect = NULL);
+  virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
 
   // New functions that will replace the above.
   virtual void SetScrollbar(int orient, int pos, int thumbVisible,
@@ -238,7 +238,7 @@ public:
   virtual int GetScrollRange(int orient) const;
   virtual int GetScrollThumb(int orient) const;
 
-  virtual void ScrollWindow(int dx, int dy, const wxRectangle *rect = NULL);
+  virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
 
   // Caret manipulation
   virtual void CreateCaret(int w, int h);

diff --git a/include/wx/stubs/dcscreen.h b/include/wx/stubs/dcscreen.h
index fd929061772351e2094e337daec76a6bbd2fe12c..e04b450f69941e8ce90f5ac3e2da5dfc90f3a923 100644 (file)
--- a/include/wx/stubs/dcscreen.h
+++ b/include/wx/stubs/dcscreen.h
@@ -30,7 +30,7 @@ class WXDLLEXPORT wxScreenDC: public wxWindowDC
   // Compatibility with X's requirements for
   // drawing on top of all windows
   static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return TRUE; }
-  static bool StartDrawingOnTop(wxRectangle* WXUNUSED(rect) = NULL) { return TRUE; }
+  static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return TRUE; }
   static bool EndDrawingOnTop() { return TRUE; }
 };
 

diff --git a/include/wx/stubs/listctrl.h b/include/wx/stubs/listctrl.h
index e8f26286d88882986c3c005deb0707fc28bebf95..6dfc25df982f2240ebdff744d894fdfdc3e04de8 100644 (file)
--- a/include/wx/stubs/listctrl.h
+++ b/include/wx/stubs/listctrl.h
@@ -241,7 +241,7 @@ class WXDLLEXPORT wxListCtrl: public wxControl
   bool SetItemData(long item, long data) ;
 
   // Gets the item rectangle
-  bool GetItemRect(long item, wxRectangle& rect, int code = wxLIST_RECT_BOUNDS) const ;
+  bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
 
   // Gets the item position
   bool GetItemPosition(long item, wxPoint& pos) const ;

diff --git a/include/wx/stubs/treectrl.h b/include/wx/stubs/treectrl.h
index c788fea4fe9d4bc03f0ad94f6d636d977b4026cb..cb307ec0e97284e31b80b0ea031e5f84ada85f87 100644 (file)
--- a/include/wx/stubs/treectrl.h
+++ b/include/wx/stubs/treectrl.h
@@ -190,7 +190,7 @@ public:
     }
 
       // bounding rect
-    bool GetItemRect(long item, wxRectangle& rect, bool textOnly = FALSE) const;
+    bool GetItemRect(long item, wxRect& rect, bool textOnly = FALSE) const;
       //
     wxTextCtrl* GetEditControl() const;
     

diff --git a/include/wx/stubs/window.h b/include/wx/stubs/window.h
index 5f75da33465ae347902c6a8800d812bd31ede94b..b34c6be6196674961f49a4a985ec0a8bf8b3a2eb 100644 (file)
--- a/include/wx/stubs/window.h
+++ b/include/wx/stubs/window.h
@@ -53,7 +53,7 @@ class WXDLLEXPORT wxCursor;
 class WXDLLEXPORT wxColourMap;
 class WXDLLEXPORT wxFont;
 class WXDLLEXPORT wxMenu;
-class WXDLLEXPORT wxRectangle;
+class WXDLLEXPORT wxRect;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxSizer;
 class WXDLLEXPORT wxList;
@@ -228,7 +228,7 @@ public:
   virtual bool PopupMenu(wxMenu *menu, int x, int y);
 
   // Send the window a refresh event
-  virtual void Refresh(bool eraseBack = TRUE, const wxRectangle *rect = NULL);
+  virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
 
   // New functions that will replace the above.
   virtual void SetScrollbar(int orient, int pos, int thumbVisible,
@@ -239,7 +239,7 @@ public:
   virtual int GetScrollRange(int orient) const;
   virtual int GetScrollThumb(int orient) const;
 
-  virtual void ScrollWindow(int dx, int dy, const wxRectangle *rect = NULL);
+  virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL);
 
   // Caret manipulation
   virtual void CreateCaret(int w, int h);

diff --git a/src/generic/gridg.cpp b/src/generic/gridg.cpp
index 2ae8945c956a07f1547f770ae59e2cf69972945a..8fae3103b21eff8e6d584bc16ad66b0e5492404c 100644 (file)
--- a/src/generic/gridg.cpp
+++ b/src/generic/gridg.cpp
@@ -744,7 +744,7 @@ void wxGenericGrid::DrawColumnLabels(wxDC *dc)
     return;
 
   int i;
-  wxRectangle rect;
+  wxRect rect;
 
   // Draw letters for columns
   rect.y = m_topOfSheet + 1;
@@ -770,12 +770,12 @@ void wxGenericGrid::DrawColumnLabels(wxDC *dc)
   }
 }
 
-void wxGenericGrid::DrawColumnLabel(wxDC *dc, wxRectangle *rect, int col)
+void wxGenericGrid::DrawColumnLabel(wxDC *dc, wxRect *rect, int col)
 {
   wxGridCell *cell = GetLabelCell(wxHORIZONTAL, col);
   if (cell)
   {
-    wxRectangle rect2;
+    wxRect rect2;
     rect2 = *rect;
     rect2.x += 3;
     rect2.y += 2;
@@ -797,7 +797,7 @@ void wxGenericGrid::DrawRowLabels(wxDC *dc)
     return;
 
   int i;
-  wxRectangle rect;
+  wxRect rect;
 
   // Draw numbers for rows
   rect.x = m_leftOfSheet;
@@ -823,12 +823,12 @@ void wxGenericGrid::DrawRowLabels(wxDC *dc)
   }
 }
 
-void wxGenericGrid::DrawRowLabel(wxDC *dc, wxRectangle *rect, int row)
+void wxGenericGrid::DrawRowLabel(wxDC *dc, wxRect *rect, int row)
 {
   wxGridCell *cell = GetLabelCell(wxVERTICAL, row);
   if (cell)
   {
-    wxRectangle rect2;
+    wxRect rect2;
     rect2 = *rect;
     rect2.x += 3;
     rect2.y += 2;
@@ -869,7 +869,7 @@ void wxGenericGrid::DrawCells(wxDC *dc)
   dc->SetPen(*wxBLACK_PEN);
 }
 
-void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int col)
+void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRect *rect, int row, int col)
 {
   wxGridCell *cell = GetCell(row, col);
   if (cell)
@@ -891,13 +891,13 @@ void wxGenericGrid::DrawCellBackground(wxDC *dc, wxRectangle *rect, int row, int
   }
 }
 
-void wxGenericGrid::DrawCellValue(wxDC *dc, wxRectangle *rect, int row, int col)
+void wxGenericGrid::DrawCellValue(wxDC *dc, wxRect *rect, int row, int col)
 {
   wxGridCell *cell = GetCell(row, col);
   if (cell)
   {
     wxBitmap *bitmap = cell->GetCellBitmap();
-    wxRectangle rect2;
+    wxRect rect2;
     rect2 = *rect;
     rect2.x += 3;
     rect2.y += 2;
@@ -1515,7 +1515,7 @@ void wxGenericGrid::DrawCellText(void)
 
   strcpy(szEdit, m_textItem->GetValue());
 
-  wxRectangle rect;
+  wxRect rect;
   rect = m_currentRect;
   rect.x += 3;
   rect.y += 2;
@@ -1555,7 +1555,7 @@ void wxGenericGrid::SetCurrentRect(int Row, int Column, int canvasW, int canvasH
   else m_currentRectVisible = TRUE;
 }
 
-static bool wxRectIntersection(wxRectangle *rect1, wxRectangle *rect2, wxRectangle *rect3)
+static bool wxRectIntersection(wxRect *rect1, wxRect *rect2, wxRect *rect3)
 {
   int x2_1 = rect1->x + rect1->width;
   int y2_1 = rect1->y + rect1->height;
@@ -1597,7 +1597,7 @@ static bool wxRectIntersection(wxRectangle *rect1, wxRectangle *rect2, wxRectang
   return TRUE;
 }
 
-void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRectangle *rect, int flag)
+void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRect *rect, int flag)
 {
   dc->BeginDrawing();
 
@@ -1609,8 +1609,8 @@ void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRectangle *re
   // If we're already clipping, we need to find the intersection
   // between current clipping area and text clipping area.
 
-  wxRectangle clipRect;
-  wxRectangle clipRect2;
+  wxRect clipRect;
+  wxRect clipRect2;
   long clipX, clipY, clipW, clipH;
   dc->GetClippingBox(&clipX, &clipY, &clipW, &clipH);
   clipRect.x = (int)clipX; clipRect.y = (int)clipY;
@@ -1674,7 +1674,7 @@ void wxGenericGrid::DrawTextRect(wxDC *dc, const wxString& text, wxRectangle *re
   dc->EndDrawing();
 }
 
-void wxGenericGrid::DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRectangle *rect, int flag)
+void wxGenericGrid::DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRect *rect, int flag)
 {
   dc->BeginDrawing();
 
@@ -1686,8 +1686,8 @@ void wxGenericGrid::DrawBitmapRect(wxDC *dc, wxBitmap *bitmap, wxRectangle *rect
   // If we're already clipping, we need to find the intersection
   // between current clipping area and text clipping area.
 
-  wxRectangle clipRect;
-  wxRectangle clipRect2;
+  wxRect clipRect;
+  wxRect clipRect2;
   long clipX, clipY, clipW, clipH;
   dc->GetClippingBox(&clipX, &clipY, &clipW, &clipH);
   clipRect.x = (int)clipX; clipRect.y = (int)clipY;

diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp
index a1309ff0b687bebffcaee14263d704fb500c26ec..424008eafabd88b8080c152af9ce0daf29c8684c 100644 (file)
--- a/src/generic/statusbr.cpp
+++ b/src/generic/statusbr.cpp
@@ -188,7 +188,7 @@ void wxStatusBar::DrawFieldText(wxDC& dc, int i)
 {
   int leftMargin = 2;
 
-  wxRectangle rect;
+  wxRect rect;
   GetFieldRect(i, rect);
 
   wxString text(GetStatusText(i));
@@ -209,7 +209,7 @@ void wxStatusBar::DrawFieldText(wxDC& dc, int i)
 
 void wxStatusBar::DrawField(wxDC& dc, int i)
 {
-  wxRectangle rect;
+  wxRect rect;
   GetFieldRect(i, rect);
 
     // Draw border
@@ -238,7 +238,7 @@ void wxStatusBar::DrawField(wxDC& dc, int i)
 }
 
   // Get the position and size of the field's internal bounding rectangle
-bool wxStatusBar::GetFieldRect(int n, wxRectangle& rect) const
+bool wxStatusBar::GetFieldRect(int n, wxRect& rect) const
 {
   if ((n < 0) || (n >= m_nFields))
     return FALSE;

diff --git a/src/gtk/dcscreen.cpp b/src/gtk/dcscreen.cpp
index bd5f0c22e03803caa45ca5393ee42297f786230e..4bab18b3795c48549117ccc45ee8ed865fa1c31e 100644 (file)
--- a/src/gtk/dcscreen.cpp
+++ b/src/gtk/dcscreen.cpp
@@ -283,7 +283,7 @@ bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
   window->GetSize( &w, &h );
   window->ClientToScreen( &x, &y );
   
-  wxRectangle rect;
+  wxRect rect;
   rect.x = x;
   rect.y = y;
   rect.width = 0;
@@ -292,7 +292,7 @@ bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
   return StartDrawingOnTop( &rect );
 }
 
-bool wxScreenDC::StartDrawingOnTop( wxRectangle *rect )
+bool wxScreenDC::StartDrawingOnTop( wxRect *rect )
 {
   int x = 0;
   int y = 0;

diff --git a/src/gtk1/dcscreen.cpp b/src/gtk1/dcscreen.cpp
index bd5f0c22e03803caa45ca5393ee42297f786230e..4bab18b3795c48549117ccc45ee8ed865fa1c31e 100644 (file)
--- a/src/gtk1/dcscreen.cpp
+++ b/src/gtk1/dcscreen.cpp
@@ -283,7 +283,7 @@ bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
   window->GetSize( &w, &h );
   window->ClientToScreen( &x, &y );
   
-  wxRectangle rect;
+  wxRect rect;
   rect.x = x;
   rect.y = y;
   rect.width = 0;
@@ -292,7 +292,7 @@ bool wxScreenDC::StartDrawingOnTop( wxWindow *window )
   return StartDrawingOnTop( &rect );
 }
 
-bool wxScreenDC::StartDrawingOnTop( wxRectangle *rect )
+bool wxScreenDC::StartDrawingOnTop( wxRect *rect )
 {
   int x = 0;
   int y = 0;

diff --git a/src/motif/listctrl.cpp b/src/motif/listctrl.cpp
index f82c2fdd293a10e3a381d29d85033ec4688a93d0..02fcd7f0fcd6b82e329dd69f86b330ed4ecb39aa 100644 (file)
--- a/src/motif/listctrl.cpp
+++ b/src/motif/listctrl.cpp
@@ -266,7 +266,7 @@ bool wxListCtrl::SetItemData(long item, long data)
 }
 
 // Gets the item rectangle
-bool wxListCtrl::GetItemRect(long item, wxRectangle& rect, int code) const
+bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {
        // TODO
     return FALSE;

diff --git a/src/motif/treectrl.cpp b/src/motif/treectrl.cpp
index 7d7147e4c3cadcfc728dbe58f8cb93d3bc73e6a6..45299b9375dd3cc65357a4b3519db4c3dec2b917 100644 (file)
--- a/src/motif/treectrl.cpp
+++ b/src/motif/treectrl.cpp
@@ -252,7 +252,7 @@ bool wxTreeCtrl::SetItemData(long item, long data)
     return SetItem(info);
 }
 
-bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const
+bool wxTreeCtrl::GetItemRect(long item, wxRect& rect, bool textOnly) const
 {
     // TODO
     return FALSE;

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 58aaf97fe9ace1968df3a1b0939a4892ca27298c..bdaa663463d590e2cc6802bcfe9a343572c7e883 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -895,7 +895,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     *externalLeading = 0;
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     Display *display = XtDisplay((Widget) GetMainWidget());
     Window thisWindow = XtWindow((Widget) GetMainWidget());
@@ -1172,7 +1172,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
 //  cerr << "Scrolling. delta = " << dx << ", " << dy << endl;
   int x, y, w, h;

diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
index a8bf38fa7286d4dfcb09e452cc42cef6cf43040e..66e3278c0e5e50e7075f57684068ea875ac1d67a 100644 (file)
--- a/src/msw/listctrl.cpp
+++ b/src/msw/listctrl.cpp
@@ -622,7 +622,7 @@ bool wxListCtrl::SetItemData(long item, long data)
 }
 
 // Gets the item rectangle
-bool wxListCtrl::GetItemRect(long item, wxRectangle& rect, int code) const
+bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {
   RECT rect2;
 

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 3fde173b1f9bdb340424f8e20c4f8272391dec46..a783d227e4a44b689f9ebc1121ccfb9cce208c54 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -778,7 +778,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     //    fontToUse->ReleaseResource();
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     HWND hWnd = (HWND) GetHWND();
     if (hWnd)
@@ -3311,7 +3311,7 @@ SetScrollPage(orient, thumbVisible, FALSE);
     }
 }
 
-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     RECT rect2;
     if ( rect )

diff --git a/src/qt/window.cpp b/src/qt/window.cpp
index 603f29994f259eab54b48c1c37728f0959816188..ed842eb30b744dd15abd56b201472b5671c9f2ba 100644 (file)
--- a/src/qt/window.cpp
+++ b/src/qt/window.cpp
@@ -370,7 +370,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     // TODO
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     // TODO
 }
@@ -534,7 +534,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     // TODO
     return 0;

diff --git a/src/stubs/listctrl.cpp b/src/stubs/listctrl.cpp
index 0f4ed673a59063659b382a2de53308f2d3b3c57e..d1d844565201ff29c49e1f4de52ee49ec1495579 100644 (file)
--- a/src/stubs/listctrl.cpp
+++ b/src/stubs/listctrl.cpp
@@ -266,7 +266,7 @@ bool wxListCtrl::SetItemData(long item, long data)
 }
 
 // Gets the item rectangle
-bool wxListCtrl::GetItemRect(long item, wxRectangle& rect, int code) const
+bool wxListCtrl::GetItemRect(long item, wxRect& rect, int code) const
 {
        // TODO
     return FALSE;

diff --git a/src/stubs/treectrl.cpp b/src/stubs/treectrl.cpp
index 5f346b38bc83686317c9e644e358078e2b16669c..137a885dbfa7e32c9096f78376146fda7cffaf68 100644 (file)
--- a/src/stubs/treectrl.cpp
+++ b/src/stubs/treectrl.cpp
@@ -252,7 +252,7 @@ bool wxTreeCtrl::SetItemData(long item, long data)
     return SetItem(info);
 }
 
-bool wxTreeCtrl::GetItemRect(long item, wxRectangle& rect, bool textOnly) const
+bool wxTreeCtrl::GetItemRect(long item, wxRect& rect, bool textOnly) const
 {
     // TODO
     return FALSE;

diff --git a/src/stubs/window.cpp b/src/stubs/window.cpp
index 1d51541d8d0ffd45441d37debcd4f72d1ef60421..fa6aac07b67bc3ffb9ab4f15f768aec78b8e3bbd 100644 (file)
--- a/src/stubs/window.cpp
+++ b/src/stubs/window.cpp
@@ -370,7 +370,7 @@ void wxWindow::GetTextExtent(const wxString& string, int *x, int *y,
     // TODO
 }
 
-void wxWindow::Refresh(bool eraseBack, const wxRectangle *rect)
+void wxWindow::Refresh(bool eraseBack, const wxRect *rect)
 {
     // TODO
 }
@@ -534,7 +534,7 @@ void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible,
 }
 
 // Does a physical scroll
-void wxWindow::ScrollWindow(int dx, int dy, const wxRectangle *rect)
+void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect)
 {
     // TODO
     return;

diff --git a/utils/nplugin/src/npframe.cpp b/utils/nplugin/src/npframe.cpp
index e3e3f636610d9966df47eefe5285b1ca055f0208..2e050c174b6cb6364124b3678be81afb963038e0 100644 (file)
--- a/utils/nplugin/src/npframe.cpp
+++ b/utils/nplugin/src/npframe.cpp
@@ -246,7 +246,7 @@ void wxPluginFrame::OnNPPrint(NPPrint* printInfo)
             void* platformPrint = printInfo->print.embedPrint.platformPrint;
 
             HDC hDC = (HDC) platformPrint;
-            wxRectangle rect;
+            wxRect rect;
             rect.x = printWindow->x;
             rect.y = printWindow->y;
             rect.width = printWindow->width;
@@ -265,7 +265,7 @@ void wxPluginFrame::OnNPPrint(NPPrint* printInfo)
         }
  }
 
-void wxPluginFrame::OnPrint(wxPrinterDC& dc, wxRectangle& rect)
+void wxPluginFrame::OnPrint(wxPrinterDC& dc, wxRect& rect)
 {
     // We must do some transformations here
        RECT winRect;

diff --git a/utils/nplugin/src/npframe.h b/utils/nplugin/src/npframe.h
index 23a45da3551742adc6873813d287e89cbacab3d1..6cac54b828bc54eca3cde71ffb65f71d4e545a89 100644 (file)
--- a/utils/nplugin/src/npframe.h
+++ b/utils/nplugin/src/npframe.h
@@ -65,7 +65,7 @@ public:
   virtual void OnNPPrint(NPPrint* printInfo);
 
   // Overridables: high-level
-  virtual void OnPrint(wxPrinterDC& dc, wxRectangle& rect);
+  virtual void OnPrint(wxPrinterDC& dc, wxRect& rect);
   virtual void OnDraw(wxDC& dc);
 
 protected: