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
This commit is contained in:
@@ -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;
|
||||
|
@@ -46,7 +46,7 @@ class WXDLLEXPORT wxGenericFontDialog: public wxDialog
|
||||
wxWindow *dialogParent;
|
||||
|
||||
// Area reserved for font display
|
||||
wxRectangle fontRect;
|
||||
wxRect fontRect;
|
||||
|
||||
wxChoice *familyChoice;
|
||||
wxChoice *styleChoice;
|
||||
|
@@ -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;
|
||||
|
@@ -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; }
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user