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

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-12-03 10:13:41 +00:00
parent 45d49251ba
commit 16e93305f2
35 changed files with 82 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/event.h
View File

@@ -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); }

6
include/wx/generic/colrdlgg.h
View File

@@ -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;

2
include/wx/generic/fontdlgg.h
View File

@@ -46,7 +46,7 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
wxWindow *dialogParent;
// Area reserved for font display
wxRectangle fontRect;
wxRect fontRect;
wxChoice *familyChoice;
wxChoice *styleChoice;

18
include/wx/generic/gridg.h
View File

@@ -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;

2
include/wx/generic/statusbr.h
View File

@@ -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; }

2
include/wx/generic/tabg.h
View File

@@ -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

2
include/wx/gtk/dcscreen.h
View File

@@ -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

2
include/wx/gtk1/dcscreen.h
View File

@@ -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

2
include/wx/motif/listctrl.h
View File

@@ -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 ;

2
include/wx/motif/treectrl.h
View File

@@ -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;

8
include/wx/motif/window.h
View File

@@ -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;

2
include/wx/msw/dcscreen.h
View File

@@ -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; }
};

2
include/wx/msw/listctrl.h
View File

@@ -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 ;

7
include/wx/msw/treectrl.h
View File

@@ -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

2
include/wx/qt/dcscreen.h
View File

@@ -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; }
};

6
include/wx/qt/window.h
View File

@@ -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);

2
include/wx/stubs/dcscreen.h
View File

@@ -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; }
};

2
include/wx/stubs/listctrl.h
View File

@@ -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 ;

2
include/wx/stubs/treectrl.h
View File

@@ -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;

6
include/wx/stubs/window.h
View File

@@ -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);