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

Use default constructors for wxSize/Point/Rect.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-10 21:33:56 +00:00
parent 1c6dd11c98
commit 2997ca30d6
23 changed files with 87 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/cmndata.cpp
View File

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

2
src/common/mediactrlcmn.cpp
View File

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

2
src/common/paper.cpp
View File

@@ -283,7 +283,7 @@ wxSize wxPrintPaperDatabase::GetSize(wxPaperSize paperId)
if (type)
return type->GetSize();
else
return wxSize(0, 0);
return wxSize();
}
// 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(0, 0));
wxPoint ptOrigin = m_combo->ClientToScreen(wxPoint());
#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(0, 0), wxSize(400, 40));
m_controlBar = new wxPreviewControlBar(m_printPreview, buttons, this, wxPoint(), wxSize(400, 40));
m_controlBar->CreateButtons();
}

12
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( 0, 0, 0, 0 );
m_zoneRect = wxRect();
}
void wxSizerItem::Init(const wxSizerFlags& flags)
@@ -119,7 +119,7 @@ wxSizerItem::wxSizerItem( int width, int height, int proportion, int flag, int b
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 )
, m_zoneRect()
, m_show( true )
, m_userData( userData )
{
@@ -132,7 +132,7 @@ wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 )
, m_zoneRect()
, m_show( true )
, m_userData( userData )
{
@@ -152,7 +152,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
, m_proportion( proportion )
, m_border( border )
, m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 )
, m_zoneRect()
, m_show( true )
, m_ratio( 0.0 )
, m_userData( userData )
@@ -363,7 +363,7 @@ int wxSizerItem::GetOption() const
//---------------------------------------------------------------------------
wxSizer::wxSizer()
: m_minSize( wxSize( 0, 0 ) )
:m_minSize()
{
}
@@ -1845,7 +1845,7 @@ void wxBookCtrlSizer::RecalcSizes()
wxSize wxBookCtrlSizer::CalcMin()
{
wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0, 0));
wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize());
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(0, 0);
return wxPoint();
}
// set the min/max size of the window

5
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(0, 0);
rightarrow[0] = wxPoint();
rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
rightarrow[2] = wxPoint(0, arrowheight - 1);
@@ -984,8 +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 = wxRect(0, 0, 0, 0);
m_rightArrowRect = wxRect(0, 0, 0, 0);
m_leftArrowRect = m_rightArrowRect = wxRect();
if ( AllowMonthChange() )
{

2
src/generic/choicbkg.cpp
View File

@@ -144,7 +144,7 @@ wxRect wxChoicebook::GetPageRect() const
{
const wxSize sizeChoice = m_choice->GetSize();
wxPoint pt(0, 0);
wxPoint pt;
wxRect rectPage(pt, GetClientSize());
switch ( GetWindowStyle() & wxCHB_ALIGN_MASK )
{

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(0, 0), wxSize(900, 900)) )
wxPoint(), wxSize(900, 900)) )
return false;
dialogParent = parent;

4
src/generic/datectlg.cpp
View File

@@ -144,10 +144,10 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
m_popup->SetFont(GetFont());
wxPanel *panel=new wxPanel(m_popup, CTRLID_PAN,
wxPoint(0, 0), wxDefaultSize,
wxPoint(), wxDefaultSize,
wxSUNKEN_BORDER);
m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime,
wxPoint(0,0), wxDefaultSize,
wxPoint(), wxDefaultSize,
wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
(wxObjectEventFunction)

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(0,0), GetClientSize(), treeStyle);
wxPoint(), GetClientSize(), treeStyle);
if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);

2
src/generic/dragimgg.cpp
View File

@@ -220,7 +220,7 @@ bool wxGenericDragImage::BeginDrag(const wxPoint& hotspot,
// dragged.
wxSize clientSize;
wxPoint pt(0, 0);
wxPoint pt;
if (!m_fullScreen)
{
clientSize = window->GetClientSize();

4
src/generic/grid.cpp
View File

@@ -10196,7 +10196,7 @@ wxRect wxGrid::BlockToDeviceRect( const wxGridCellCoords &topLeft,
}
else
{
rect = wxRect( 0, 0, 0, 0 );
rect = wxRect();
}
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( 0, 0, 0, 0);
return wxRect();
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(0, 0), cell, wxPoint(INT_MAX, INT_MAX), cell);
htmlSel.Set(wxPoint(), cell, wxPoint(INT_MAX, INT_MAX), cell);
htmlRendInfo.SetSelection(&htmlSel);
if ( m_htmlRendStyle )
htmlRendInfo.SetStyle(m_htmlRendStyle);

2
src/generic/listbkg.cpp
View File

@@ -172,7 +172,7 @@ wxRect wxListbook::GetPageRect() const
{
const wxSize sizeList = m_list->GetSize();
wxPoint pt(0, 0);
wxPoint pt;
wxRect rectPage(pt, GetClientSize());
switch ( GetWindowStyle() & wxLB_ALIGN_MASK )
{

4
src/generic/listctrl.cpp
View File

@@ -4645,7 +4645,7 @@ void wxGenericListCtrl::CreateHeaderWindow()
m_headerWin = new wxListHeaderWindow
(
this, wxID_ANY, m_mainWin,
wxPoint(0, 0),
wxPoint(),
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(0,0), size, style );
m_mainWin = new wxListMainWindow( this, wxID_ANY, wxPoint(), 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(0, 0), wxSize(100, 100), 0);
bool success = wxNotebook::Create(parent, wxID_NOTEBOOK_CLIENT_AREA, wxPoint(), 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(0, 0), wxSize(600, 600),
wxPoint(), 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(0, 0), wxSize(600, 600),
wxPoint(), 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(0, 0), wxSize(600, 600),
// wxDialog::Create(parent, wxID_ANY, _("Print"), wxPoint(), 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(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL)
wxDialog(parent, wxID_ANY, _("Print Setup"), wxPoint(), 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(0, 0),
wxPoint(),
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[3] =
{
wxPoint(0, 0),
wxPoint(),
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(0, 0), wxSize(100, 100), style)
wxFrame(parent, id, wxEmptyString, wxPoint(), 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(0,0);
m_lastSize = wxSize();
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(0,0);
m_lastSize = wxSize();
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(0, 0));
Position(wxPoint(x, y), wxSize());
Popup(m_view);
#ifdef __WXGTK__
if (!GTK_WIDGET_HAS_GRAB(m_widget))