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

34
src/generic/gridg.cpp
View File

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

6
src/generic/statusbr.cpp
View File

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

4
src/gtk/dcscreen.cpp
View File

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

4
src/gtk1/dcscreen.cpp
View File

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

2
src/motif/listctrl.cpp
View File

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

2
src/motif/treectrl.cpp
View File

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

4
src/motif/window.cpp
View File

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

2
src/msw/listctrl.cpp
View File

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

4
src/msw/window.cpp
View File

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

4
src/qt/window.cpp
View File

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

2
src/stubs/listctrl.cpp
View File

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

2
src/stubs/treectrl.cpp
View File

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

4
src/stubs/window.cpp
View File

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