From c47addef107f756f1a342d2f3f8d432e784691a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 16 Feb 2005 20:34:34 +0000 Subject: [PATCH] wxPoint/Size/Rect() causes the same code with (0,0) initialization and is incomparably more readable and clear. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dc.h | 2 +- include/wx/mediactrl.h | 2 +- src/common/cmndata.cpp | 8 ++++---- src/common/mediactrlcmn.cpp | 2 +- src/common/paper.cpp | 2 +- src/common/popupcmn.cpp | 2 +- src/common/prntbase.cpp | 2 +- src/common/sizer.cpp | 4 ++-- src/common/wincmn.cpp | 2 +- src/generic/calctrl.cpp | 4 ++-- src/generic/colrdlgg.cpp | 2 +- src/generic/dirctrlg.cpp | 2 +- src/generic/grid.cpp | 4 ++-- src/generic/htmllbox.cpp | 2 +- src/generic/listctrl.cpp | 4 ++-- src/generic/mdig.cpp | 2 +- src/generic/prntdlgg.cpp | 10 +++++----- src/generic/renderg.cpp | 2 +- src/generic/splash.cpp | 2 +- src/generic/splitter.cpp | 4 ++-- src/generic/tipwin.cpp | 2 +- src/msw/dc.cpp | 2 +- src/msw/dcclient.cpp | 2 +- src/msw/font.cpp | 2 +- src/msw/joystick.cpp | 2 +- src/msw/mediactrl.cpp | 2 +- src/msw/printdlg.cpp | 6 +++--- src/msw/treectrl.cpp | 2 +- src/msw/window.cpp | 2 +- src/univ/combobox.cpp | 2 +- src/univ/menu.cpp | 2 +- src/univ/radiobox.cpp | 2 +- src/univ/themes/gtk.cpp | 4 ++-- src/univ/winuniv.cpp | 4 ++-- 34 files changed, 50 insertions(+), 50 deletions(-) diff --git a/include/wx/dc.h b/include/wx/dc.h index 6deddb04f9..0e6d1d055b 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -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. diff --git a/include/wx/mediactrl.h b/include/wx/mediactrl.h index 44eaa37c1c..4caa45cc70 100644 --- a/include/wx/mediactrl.h +++ b/include/wx/mediactrl.h @@ -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; } diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp index a03afbf303..1896239b72 100644 --- a/src/common/cmndata.cpp +++ b/src/common/cmndata.cpp @@ -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; diff --git a/src/common/mediactrlcmn.cpp b/src/common/mediactrlcmn.cpp index f5994cb27b..1955ac10ce 100644 --- a/src/common/mediactrlcmn.cpp +++ b/src/common/mediactrlcmn.cpp @@ -392,7 +392,7 @@ wxSize wxMediaCtrl::DoGetBestSize() const { if(m_imp) return m_imp->GetVideoSize(); - return wxSize(); + return wxSize(0,0); } //--------------------------------------------------------------------------- diff --git a/src/common/paper.cpp b/src/common/paper.cpp index 457e790c02..bad72e6dc2 100644 --- a/src/common/paper.cpp +++ b/src/common/paper.cpp @@ -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 diff --git a/src/common/popupcmn.cpp b/src/common/popupcmn.cpp index 3a6ba467bf..e4c673e313 100644 --- a/src/common/popupcmn.cpp +++ b/src/common/popupcmn.cpp @@ -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 diff --git a/src/common/prntbase.cpp b/src/common/prntbase.cpp index 1f1f0487f7..6afdf78053 100644 --- a/src/common/prntbase.cpp +++ b/src/common/prntbase.cpp @@ -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(); } diff --git a/src/common/sizer.cpp b/src/common/sizer.cpp index 63aa512c25..60f03929c5 100644 --- a/src/common/sizer.cpp +++ b/src/common/sizer.cpp @@ -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; diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index bf4d550a20..a6a6360864 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -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 diff --git a/src/generic/calctrl.cpp b/src/generic/calctrl.cpp index 1660d5d6fe..f7ee6134f4 100644 --- a/src/generic/calctrl.cpp +++ b/src/generic/calctrl.cpp @@ -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() ) { diff --git a/src/generic/colrdlgg.cpp b/src/generic/colrdlgg.cpp index 2c4766cbf9..a506140419 100644 --- a/src/generic/colrdlgg.cpp +++ b/src/generic/colrdlgg.cpp @@ -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; diff --git a/src/generic/dirctrlg.cpp b/src/generic/dirctrlg.cpp index 13050d865b..ab912cea50 100644 --- a/src/generic/dirctrlg.cpp +++ b/src/generic/dirctrlg.cpp @@ -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); diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp index 48ff5cf934..10c5b9d030 100644 --- a/src/generic/grid.cpp +++ b/src/generic/grid.cpp @@ -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) ); diff --git a/src/generic/htmllbox.cpp b/src/generic/htmllbox.cpp index 3b78664fd0..80d4442fb6 100644 --- a/src/generic/htmllbox.cpp +++ b/src/generic/htmllbox.cpp @@ -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); diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp index 67279c9a1e..2c59553c86 100644 --- a/src/generic/listctrl.cpp +++ b/src/generic/listctrl.cpp @@ -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 diff --git a/src/generic/mdig.cpp b/src/generic/mdig.cpp index 8d33478b6d..ebafe05ac0 100644 --- a/src/generic/mdig.cpp +++ b/src/generic/mdig.cpp @@ -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) { /* diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp index c59a8338b6..a9784b3905 100644 --- a/src/generic/prntdlgg.cpp +++ b/src/generic/prntdlgg.cpp @@ -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 ) { diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp index 1a81c8626f..2a6c00da5f 100644 --- a/src/generic/renderg.cpp +++ b/src/generic/renderg.cpp @@ -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) }; diff --git a/src/generic/splash.cpp b/src/generic/splash.cpp index 099417e909..2f703733f9 100644 --- a/src/generic/splash.cpp +++ b/src/generic/splash.cpp @@ -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__) diff --git a/src/generic/splitter.cpp b/src/generic/splitter.cpp index e2a2a3ca99..7c5d2354bd 100644 --- a/src/generic/splitter.cpp +++ b/src/generic/splitter.cpp @@ -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(); diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp index 27703a53cf..30e6e9d871 100644 --- a/src/generic/tipwin.cpp +++ b/src/generic/tipwin.cpp @@ -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)) diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 0ec26a8b0e..a56e537832 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -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); diff --git a/src/msw/dcclient.cpp b/src/msw/dcclient.cpp index f3ffe0ebd3..ad83a7b49f 100644 --- a/src/msw/dcclient.cpp +++ b/src/msw/dcclient.cpp @@ -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__ } diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 6c47dc906f..c3ed95c514 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -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); } diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp index 46a7666794..b445fefaf3 100644 --- a/src/msw/joystick.cpp +++ b/src/msw/joystick.cpp @@ -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 diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp index 526ca577e9..6d38693a0f 100644 --- a/src/msw/mediactrl.cpp +++ b/src/msw/mediactrl.cpp @@ -1176,7 +1176,7 @@ wxSize wxMCIMediaBackend::GetVideoSize() const return wxSize(whereParms.rc.right, whereParms.rc.bottom); } - return wxSize(); + return wxSize(0,0); } //--------------------------------------------------------------------------- diff --git a/src/msw/printdlg.cpp b/src/msw/printdlg.cpp index 3b01b5b5b1..56e9af2adb 100644 --- a/src/msw/printdlg.cpp +++ b/src/msw/printdlg.cpp @@ -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 diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index a916177248..23722d24ec 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -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; diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 9888a26491..31a58a801c 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -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 diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp index e261d32fde..dbe2c63b75 100644 --- a/src/univ/combobox.cpp +++ b/src/univ/combobox.cpp @@ -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); } diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp index 6fe24d28e9..b7f2016a85 100644 --- a/src/univ/menu.cpp +++ b/src/univ/menu.cpp @@ -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 diff --git a/src/univ/radiobox.cpp b/src/univ/radiobox.cpp index 9fadd8eb26..6637727315 100644 --- a/src/univ/radiobox.cpp +++ b/src/univ/radiobox.cpp @@ -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; diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp index 02019feee6..8051f0b5b9 100644 --- a/src/univ/themes/gtk.cpp +++ b/src/univ/themes/gtk.cpp @@ -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 diff --git a/src/univ/winuniv.cpp b/src/univ/winuniv.cpp index 4e38559a5d..2a730a3a9c 100644 --- a/src/univ/winuniv.cpp +++ b/src/univ/winuniv.cpp @@ -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)"), -- 2.47.2