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

wxPoint/Size/Rect() causes the same code with (0,0) initialization and is incomparably more readable and clear.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-16 20:34:34 +00:00
parent ee799df7ff
commit c47addef10
34 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/dc.h
View File

@@ -348,7 +348,7 @@ public:
* \param angle Rotating angle (counterclockwise, start at 3 o'clock, 360 is full circle).
* \param center Center of rotation.
*/
void Rotate( wxList* points, double angle, wxPoint center = wxPoint() );
void Rotate( wxList* points, double angle, wxPoint center = wxPoint(0,0) );
// used by DrawEllipticArcRot
// Careful: wxList gets filled with points you have to delete later.

2
include/wx/mediactrl.h
View File

@@ -257,7 +257,7 @@ public:
int WXUNUSED(w), int WXUNUSED(h))
{ }
virtual wxSize GetVideoSize() const
{ return wxSize(); }
{ return wxSize(0,0); }
virtual double GetPlaybackRate()
{ return 0.0; }

8
src/common/cmndata.cpp
View File

@@ -534,14 +534,14 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
wxPageSetupDialogData::wxPageSetupDialogData()
{
m_paperSize = wxSize();
m_paperSize = wxSize(0,0);
CalculatePaperSizeFromId();
m_minMarginTopLeft =
m_minMarginBottomRight =
m_marginTopLeft =
m_marginBottomRight = wxPoint();
m_marginBottomRight = wxPoint(0,0);
// Flags
m_defaultMinMargins = false;
@@ -561,11 +561,11 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialog
wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
{
m_paperSize = wxSize();
m_paperSize = wxSize(0,0);
m_minMarginTopLeft =
m_minMarginBottomRight =
m_marginTopLeft =
m_marginBottomRight = wxPoint();
m_marginBottomRight = wxPoint(0,0);
// Flags
m_defaultMinMargins = false;

2
src/common/mediactrlcmn.cpp
View File

@@ -392,7 +392,7 @@ wxSize wxMediaCtrl::DoGetBestSize() const
{
if(m_imp)
return m_imp->GetVideoSize();
return wxSize();
return wxSize(0,0);
}
//---------------------------------------------------------------------------

2
src/common/paper.cpp
View File

@@ -283,7 +283,7 @@ wxSize wxPrintPaperDatabase::GetSize(wxPaperSize paperId)
if (type)
return type->GetSize();
else
return wxSize();
return wxSize(0,0);
}
// Get the paper size

2
src/common/popupcmn.cpp
View File

@@ -382,7 +382,7 @@ bool wxPopupComboWindow::Create(wxComboControl *parent)
void wxPopupComboWindow::PositionNearCombo()
{
// the origin point must be in screen coords
wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint());
wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint(0,0));
#if 0 //def __WXUNIVERSAL__
// account for the fact that (0, 0) is not the top left corner of the

2
src/common/prntbase.cpp
View File

@@ -1006,7 +1006,7 @@ void wxPreviewFrame::CreateControlBar()
if (m_printPreview->GetPrintoutForPrinting())
buttons |= wxPREVIEW_PRINT;
m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(), wxSize(400, 40));
m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(0,0), wxSize(400, 40));
m_controlBar->CreateButtons();
}

4
src/common/sizer.cpp
View File

@@ -99,7 +99,7 @@ void wxSizerItem::Init()
m_sizer = NULL;
m_show = true;
m_userData = NULL;
m_zoneRect = wxRect();
m_zoneRect = wxRect(0,0,0,0);
}
void wxSizerItem::Init(const wxSizerFlags& flags)
@@ -1851,7 +1851,7 @@ void wxBookCtrlSizer::RecalcSizes()
wxSize wxBookCtrlSizer::CalcMin()
{
wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize());
wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0,0));
sizeBorder.x += 5;
sizeBorder.y += 5;

2
src/common/wincmn.cpp
View File

@@ -699,7 +699,7 @@ void wxWindowBase::SetBestFittingSize(const wxSize& size)
// by default the origin is not shifted
wxPoint wxWindowBase::GetClientAreaOrigin() const
{
return wxPoint();
return wxPoint(0,0);
}
// set the min/max size of the window

4
src/generic/calctrl.cpp
View File

@@ -975,7 +975,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
leftarrow[1] = wxPoint(arrowheight / 2, 0);
leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
rightarrow[0] = wxPoint();
rightarrow[0] = wxPoint(0,0);
rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
rightarrow[2] = wxPoint(0, arrowheight - 1);
@@ -984,7 +984,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
wxCoord arrowy = (m_heightRow - arrowheight) / 2;
wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2;
wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;
m_leftArrowRect = m_rightArrowRect = wxRect();
m_leftArrowRect = m_rightArrowRect = wxRect(0,0,0,0);
if ( AllowMonthChange() )
{

2
src/generic/colrdlgg.cpp
View File

@@ -149,7 +149,7 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
{
if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"),
wxPoint(), wxSize(900, 900)) )
wxPoint(0,0), wxSize(900, 900)) )
return false;
dialogParent = parent;

2
src/generic/dirctrlg.cpp
View File

@@ -524,7 +524,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
filterStyle |= wxBORDER_SUNKEN;
m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL,
wxPoint(), GetClientSize(), treeStyle);
wxPoint(0,0), GetClientSize(), treeStyle);
if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);

4
src/generic/grid.cpp
View File

@@ -10196,7 +10196,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
}
else
{
rect = wxRect();
rect = wxRect(0,0,0,0);
}
cellRect = CellToRect( bottomRight );
@@ -10271,7 +10271,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
m_gridWin->GetClientSize( &cw, &ch );
if (right < 0 || bottom < 0 || left > cw || top > ch)
return wxRect();
return wxRect(0,0,0,0);
rect.SetLeft( wxMax(0, left) );
rect.SetTop( wxMax(0, top) );

2
src/generic/htmllbox.cpp
View File

@@ -331,7 +331,7 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const
if ( IsSelected(n) )
{
wxHtmlSelection htmlSel;
htmlSel.Set(wxPoint(), cell, wxPoint(INT_MAX, INT_MAX), cell);
htmlSel.Set(wxPoint(0,0), cell, wxPoint(INT_MAX, INT_MAX), cell);
htmlRendInfo.SetSelection(&htmlSel);
if ( m_htmlRendStyle )
htmlRendInfo.SetStyle(m_htmlRendStyle);

4
src/generic/listctrl.cpp
View File

@@ -4645,7 +4645,7 @@ void wxGenericListCtrl::CreateHeaderWindow()
m_headerWin = new wxListHeaderWindow
(
this, wxID_ANY, m_mainWin,
wxPoint(),
wxPoint(0,0),
wxSize(GetClientSize().x, m_headerHeight),
wxTAB_TRAVERSAL
);
@@ -4683,7 +4683,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
// don't create the inner window with the border
style &= ~wxBORDER_MASK;
m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(), size, style );
m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(0,0), size, style );
#ifdef __WXMAC_CARBON__
// Human Interface Guidelines ask us for a special font in this case

2
src/generic/mdig.cpp
View File

@@ -699,7 +699,7 @@ bool wxGenericMDIClientWindow::CreateClient( wxGenericMDIParentFrame *parent, lo
{
SetWindowStyleFlag(style);
bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(), wxSize(100, 100), 0);
bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(0,0), wxSize(100, 100), 0);
if (success)
{
/*

10
src/generic/prntdlgg.cpp
View File

@@ -136,7 +136,7 @@ END_EVENT_TABLE()
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintDialogData* data)
: wxPrintDialogBase(parent, wxID_ANY, _("Print"),
wxPoint(), wxSize(600, 600),
wxPoint(0,0), wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
@@ -149,7 +149,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
wxPrintData* data)
: wxPrintDialogBase(parent, wxID_ANY, _("Print"),
wxPoint(), wxSize(600, 600),
wxPoint(0,0), wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE |
wxTAB_TRAVERSAL)
{
@@ -161,7 +161,7 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
{
// wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(), wxSize(600, 600),
// wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(0,0), wxSize(600, 600),
// wxDEFAULT_DIALOG_STYLE | wxTAB_TRAVERSAL);
wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL );
@@ -442,7 +442,7 @@ BEGIN_EVENT_TABLE(wxGenericPrintSetupDialog, wxDialog)
END_EVENT_TABLE()
wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintData* data):
wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(0,0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
{
Init(data);
}
@@ -821,7 +821,7 @@ wxGenericPageSetupDialog::wxGenericPageSetupDialog( wxWindow *parent,
: wxPageSetupDialogBase( parent,
wxID_ANY,
_("Page Setup"),
wxPoint(),
wxPoint(0,0),
wxSize(600, 600),
wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL )
{

2
src/generic/renderg.cpp
View File

@@ -355,7 +355,7 @@ wxRendererGeneric::DrawComboBoxDropButton(wxWindow *win,
wxPoint pt[] =
{
wxPoint(),
wxPoint(0,0),
wxPoint(rect.width, 0),
wxPoint(rect.width/2, rect.height - 2)
};

2
src/generic/splash.cpp
View File

@@ -53,7 +53,7 @@ END_EVENT_TABLE()
*/
wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int milliseconds, wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style):
wxFrame(parent, id, wxEmptyString, wxPoint(), wxSize(100, 100), style)
wxFrame(parent, id, wxEmptyString, wxPoint(0,0), wxSize(100, 100), style)
{
// At least for GTK+ 2.0, this hint is not available.
#if defined(__WXGTK20__)

4
src/generic/splitter.cpp
View File

@@ -122,7 +122,7 @@ void wxSplitterWindow::Init()
m_firstY = 0;
m_sashPosition = m_requestedSashPosition = 0;
m_sashGravity = 0.0;
m_lastSize = wxSize();
m_lastSize = wxSize(0,0);
m_checkRequestedSashPosition = false;
m_minimumPaneSize = 0;
m_sashCursorWE = wxCursor(wxCURSOR_SIZEWE);
@@ -414,7 +414,7 @@ void wxSplitterWindow::OnSize(wxSizeEvent& event)
if ( iconized )
{
m_lastSize = wxSize();
m_lastSize = wxSize(0,0);
event.Skip();

2
src/generic/tipwin.cpp
View File

@@ -157,7 +157,7 @@ wxTipWindow::wxTipWindow(wxWindow *parent,
y += wxSystemSettings::GetMetric(wxSYS_CURSOR_Y) / 2;
#if wxUSE_POPUPWIN
Position(wxPoint(x, y), wxSize());
Position(wxPoint(x, y), wxSize(0,0));
Popup(m_view);
#ifdef __WXGTK__
if (!GTK_WIDGET_HAS_GRAB(m_widget))

2
src/msw/dc.cpp
View File

@@ -2227,7 +2227,7 @@ void wxDC::DoGetSizeMM(int *w, int *h) const
wxSize wxDC::GetPPI() const
{
WXMICROWIN_CHECK_HDC_RET(wxSize())
WXMICROWIN_CHECK_HDC_RET(wxSize(0,0))
int x = ::GetDeviceCaps(GetHdc(), LOGPIXELSX);
int y = ::GetDeviceCaps(GetHdc(), LOGPIXELSY);

2
src/msw/dcclient.cpp
View File

@@ -169,7 +169,7 @@ void wxClientDC::InitDC()
}
// clip the DC to avoid overwriting the non client area
SetClippingRegion(wxPoint(), m_canvas->GetClientSize());
SetClippingRegion(wxPoint(0,0), m_canvas->GetClientSize());
#endif // __WXUNIVERSAL__ || __WXWINCE__
}

2
src/msw/font.cpp
View File

@@ -108,7 +108,7 @@ public:
// constructors
wxFontRefData()
{
Init(-1, wxSize(), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
Init(-1, wxSize(0,0), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL, false, wxEmptyString,
wxFONTENCODING_DEFAULT);
}

2
src/msw/joystick.cpp
View File

@@ -87,7 +87,7 @@ wxPoint wxJoystick::GetPosition() const
if (res == JOYERR_NOERROR )
return wxPoint(joyInfo.wXpos, joyInfo.wYpos);
else
return wxPoint();
return wxPoint(0,0);
}
int wxJoystick::GetZPosition() const

2
src/msw/mediactrl.cpp
View File

@@ -1176,7 +1176,7 @@ wxSize wxMCIMediaBackend::GetVideoSize() const
return wxSize(whereParms.rc.right, whereParms.rc.bottom);
}
return wxSize();
return wxSize(0,0);
}
//---------------------------------------------------------------------------

6
src/msw/printdlg.cpp
View File

@@ -215,7 +215,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
// Shouldn't really get here
wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
data.SetPaperId( wxPAPER_NONE );
data.SetPaperSize( wxSize() );
data.SetPaperSize( wxSize(0,0) );
}
}
else
@@ -223,7 +223,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
// Shouldn't really get here
wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
data.SetPaperId( wxPAPER_NONE );
data.SetPaperSize( wxSize() );
data.SetPaperSize( wxSize(0,0) );
}
}
else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
@@ -237,7 +237,7 @@ bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
// Shouldn't really get here
wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
data.SetPaperId( wxPAPER_NONE );
data.SetPaperSize( wxSize() );
data.SetPaperSize( wxSize(0,0) );
}
//// Duplex

2
src/msw/treectrl.cpp
View File

@@ -2903,7 +2903,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
m_dragImage = new wxDragImage(*this, event.m_item);
m_dragImage->BeginDrag(wxPoint(), this);
m_dragImage->BeginDrag(wxPoint(0,0), this);
m_dragImage->Show();
}
break;

2
src/msw/window.cpp
View File

@@ -2782,7 +2782,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
wxHelpEvent helpEvent(wxEVT_HELP,
subjectOfHelp->GetId(),
#ifdef __WXWINCE__
wxPoint()
wxPoint(0,0)
#else
wxPoint(info->MousePos.x, info->MousePos.y)
#endif

2
src/univ/combobox.cpp
View File

@@ -330,7 +330,7 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
wxSize sizeBtn = m_btn->GetBestSize();
wxCoord wText = width - sizeBtn.x;
wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
m_text->SetSize(x - p.x, y - p.y, wText, height);
m_btn->SetSize(x - p.x + wText, y - p.y, sizeBtn.x, height);
}

2
src/univ/menu.cpp
View File

@@ -2515,7 +2515,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
// wxLogDebug( "Name of invoking window %s", menu->GetInvokingWindow()->GetName().c_str() );
menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize());
menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0,0));
// this is not very useful if the menu was popped up because of the mouse
// click but I think it is nice to do when it appears because of a key

2
src/univ/radiobox.cpp
View File

@@ -445,7 +445,7 @@ void wxRadioBox::DoMoveWindow(int x0, int y0, int width, int height)
wxSize sizeBtn = GetMaxButtonSize();
wxPoint ptOrigin = GetBoxAreaOrigin();
wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;

4
src/univ/themes/gtk.cpp
View File

@@ -2326,7 +2326,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win,
wxSize
wxGTKRenderer::GetStatusBarBorders(wxCoord * WXUNUSED(borderBetweenFields)) const
{
return wxSize();
return wxSize(0,0);
}
void wxGTKRenderer::DrawStatusField(wxDC& WXUNUSED(dc),
@@ -2913,7 +2913,7 @@ wxGTKRenderer::GetFrameTotalSize(const wxSize& clientSize,
wxSize wxGTKRenderer::GetFrameMinSize(int WXUNUSED(flags)) const
{
return wxSize();
return wxSize(0,0);
}
wxSize wxGTKRenderer::GetFrameIconSize() const

4
src/univ/winuniv.cpp
View File

@@ -1112,12 +1112,12 @@ wxRect wxWindow::ScrollNoRefresh(int dx, int dy, const wxRect *rectTotal)
wxMemoryDC dcMem;
dcMem.SelectObject(bmp);
dcMem.Blit(wxPoint(), size, &dc, ptSource
dcMem.Blit(wxPoint(0,0), size, &dc, ptSource
#if defined(__WXGTK__) && !defined(wxHAS_WORKING_GTK_DC_BLIT)
+ GetClientAreaOrigin()
#endif // broken wxGTK wxDC::Blit
);
dc.Blit(ptDest, size, &dcMem, wxPoint());
dc.Blit(ptDest, size, &dcMem, wxPoint(0,0));
wxLogTrace(_T("scroll"),
_T("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),