Use default constructors for wxSize/Point/Rect.

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

View File

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

View File

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

View File

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

View File

@@ -282,7 +282,7 @@ bool wxPopupTransientWindow::Show( bool show )
if (!show) if (!show)
{ {
gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME ); gdk_pointer_ungrab( (guint32)GDK_CURRENT_TIME );
gtk_grab_remove( m_widget ); gtk_grab_remove( m_widget );
} }
#endif #endif
@@ -295,12 +295,12 @@ bool wxPopupTransientWindow::Show( bool show )
#endif #endif
bool ret = wxPopupWindow::Show( show ); bool ret = wxPopupWindow::Show( show );
#ifdef __WXGTK__ #ifdef __WXGTK__
if (show) if (show)
{ {
gtk_grab_add( m_widget ); gtk_grab_add( m_widget );
gdk_pointer_grab( m_widget->window, TRUE, gdk_pointer_grab( m_widget->window, TRUE,
(GdkEventMask) (GdkEventMask)
(GDK_BUTTON_PRESS_MASK | (GDK_BUTTON_PRESS_MASK |
@@ -317,7 +317,7 @@ bool wxPopupTransientWindow::Show( bool show )
if (show) if (show)
{ {
Window xwindow = (Window) m_clientWindow; Window xwindow = (Window) m_clientWindow;
/* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow, /* int res =*/ XGrabPointer(wxGlobalDisplay(), xwindow,
True, True,
ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, ButtonPressMask | ButtonReleaseMask | ButtonMotionMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
@@ -382,7 +382,7 @@ bool wxPopupComboWindow::Create(wxComboControl *parent)
void wxPopupComboWindow::PositionNearCombo() void wxPopupComboWindow::PositionNearCombo()
{ {
// the origin point must be in screen coords // 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__ #if 0 //def __WXUNIVERSAL__
// account for the fact that (0, 0) is not the top left corner of the // account for the fact that (0, 0) is not the top left corner of the

View File

@@ -134,7 +134,7 @@ wxPrintPreviewBase *wxNativePrintFactory::CreatePrintPreview( wxPrintout *previe
#endif #endif
} }
wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
wxPrintDialogData *data ) wxPrintDialogData *data )
{ {
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
@@ -146,7 +146,7 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
#endif #endif
} }
wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent, wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
wxPrintData *data ) wxPrintData *data )
{ {
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
@@ -158,7 +158,7 @@ wxPrintDialogBase *wxNativePrintFactory::CreatePrintDialog( wxWindow *parent,
#endif #endif
} }
wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent, wxPageSetupDialogBase *wxNativePrintFactory::CreatePageSetupDialog( wxWindow *parent,
wxPageSetupDialogData *data ) wxPageSetupDialogData *data )
{ {
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
@@ -183,10 +183,10 @@ bool wxNativePrintFactory::HasPrintSetupDialog()
// the printer from the wxPrintDialog anyway. // the printer from the wxPrintDialog anyway.
return true; return true;
#endif #endif
} }
wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent, wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
wxPrintData *data ) wxPrintData *data )
{ {
#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
@@ -209,7 +209,7 @@ wxDialog *wxNativePrintFactory::CreatePrintSetupDialog( wxWindow *parent,
bool wxNativePrintFactory::HasOwnPrintToFile() bool wxNativePrintFactory::HasOwnPrintToFile()
{ {
// Only relevant for PostScript and here the // Only relevant for PostScript and here the
// setup dialog provides no "print to file" // setup dialog provides no "print to file"
// option. In the GNOME setup dialog, the // option. In the GNOME setup dialog, the
// setup dialog has its own print to file. // setup dialog has its own print to file.
return false; return false;
@@ -224,7 +224,7 @@ bool wxNativePrintFactory::HasPrinterLine()
wxString wxNativePrintFactory::CreatePrinterLine() wxString wxNativePrintFactory::CreatePrinterLine()
{ {
// Only relevant for PostScript for now // Only relevant for PostScript for now
// We should query "lpstat -d" here // We should query "lpstat -d" here
return _("Generic PostScript"); return _("Generic PostScript");
} }
@@ -232,13 +232,13 @@ wxString wxNativePrintFactory::CreatePrinterLine()
bool wxNativePrintFactory::HasStatusLine() bool wxNativePrintFactory::HasStatusLine()
{ {
// Only relevant for PostScript for now // Only relevant for PostScript for now
return true; return true;
} }
wxString wxNativePrintFactory::CreateStatusLine() wxString wxNativePrintFactory::CreateStatusLine()
{ {
// Only relevant for PostScript for now // Only relevant for PostScript for now
// We should query "lpstat -r" or "lpstat -p" here // We should query "lpstat -r" or "lpstat -p" here
return _("Ready"); return _("Ready");
} }
@@ -261,8 +261,8 @@ wxPrintNativeDataBase *wxNativePrintFactory::CreatePrintNativeData()
IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject) IMPLEMENT_ABSTRACT_CLASS(wxPrintNativeDataBase, wxObject)
wxPrintNativeDataBase::wxPrintNativeDataBase() wxPrintNativeDataBase::wxPrintNativeDataBase()
{ {
m_ref = 1; m_ref = 1;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@@ -275,7 +275,7 @@ public:
wxPrintFactoryModule() {} wxPrintFactoryModule() {}
bool OnInit() { return true; } bool OnInit() { return true; }
void OnExit() { wxPrintFactory::SetPrintFactory( NULL ); } void OnExit() { wxPrintFactory::SetPrintFactory( NULL ); }
private: private:
DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule) DECLARE_DYNAMIC_CLASS(wxPrintFactoryModule)
}; };
@@ -386,7 +386,7 @@ wxPrintDialogData& wxPrinter::GetPrintDialogData() const
IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog) IMPLEMENT_ABSTRACT_CLASS(wxPrintDialogBase, wxDialog)
wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent, wxPrintDialogBase::wxPrintDialogBase(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString &title, const wxString &title,
const wxPoint &pos, const wxPoint &pos,
const wxSize &size, const wxSize &size,
@@ -444,7 +444,7 @@ wxDC *wxPrintDialog::GetPrintDC()
IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog) IMPLEMENT_ABSTRACT_CLASS(wxPageSetupDialogBase, wxDialog)
wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent, wxPageSetupDialogBase::wxPageSetupDialogBase(wxWindow *parent,
wxWindowID id, wxWindowID id,
const wxString &title, const wxString &title,
const wxPoint &pos, const wxPoint &pos,
const wxSize &size, const wxSize &size,
@@ -1006,7 +1006,7 @@ void wxPreviewFrame::CreateControlBar()
if (m_printPreview->GetPrintoutForPrinting()) if (m_printPreview->GetPrintoutForPrinting())
buttons |= wxPREVIEW_PRINT; 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(); m_controlBar->CreateButtons();
} }

View File

@@ -99,7 +99,7 @@ void wxSizerItem::Init()
m_sizer = NULL; m_sizer = NULL;
m_show = true; m_show = true;
m_userData = NULL; m_userData = NULL;
m_zoneRect = wxRect( 0, 0, 0, 0 ); m_zoneRect = wxRect();
} }
void wxSizerItem::Init(const wxSizerFlags& flags) 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_proportion( proportion )
, m_border( border ) , m_border( border )
, m_flag( flag ) , m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 ) , m_zoneRect()
, m_show( true ) , m_show( true )
, m_userData( userData ) , m_userData( userData )
{ {
@@ -132,7 +132,7 @@ wxSizerItem::wxSizerItem( wxWindow *window, int proportion, int flag, int border
, m_proportion( proportion ) , m_proportion( proportion )
, m_border( border ) , m_border( border )
, m_flag( flag ) , m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 ) , m_zoneRect()
, m_show( true ) , m_show( true )
, m_userData( userData ) , m_userData( userData )
{ {
@@ -152,7 +152,7 @@ wxSizerItem::wxSizerItem( wxSizer *sizer, int proportion, int flag, int border,
, m_proportion( proportion ) , m_proportion( proportion )
, m_border( border ) , m_border( border )
, m_flag( flag ) , m_flag( flag )
, m_zoneRect( 0, 0, 0, 0 ) , m_zoneRect()
, m_show( true ) , m_show( true )
, m_ratio( 0.0 ) , m_ratio( 0.0 )
, m_userData( userData ) , m_userData( userData )
@@ -363,7 +363,7 @@ int wxSizerItem::GetOption() const
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
wxSizer::wxSizer() wxSizer::wxSizer()
: m_minSize( wxSize( 0, 0 ) ) :m_minSize()
{ {
} }
@@ -1699,7 +1699,7 @@ void wxStdDialogButtonSizer::AddButton(wxButton *mybutton)
m_buttonCancel = mybutton; m_buttonCancel = mybutton;
break; break;
case wxID_HELP: case wxID_HELP:
case wxID_CONTEXT_HELP: case wxID_CONTEXT_HELP:
m_buttonHelp = mybutton; m_buttonHelp = mybutton;
break; break;
default: default:
@@ -1845,7 +1845,7 @@ void wxBookCtrlSizer::RecalcSizes()
wxSize wxBookCtrlSizer::CalcMin() wxSize wxBookCtrlSizer::CalcMin()
{ {
wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize(0, 0)); wxSize sizeBorder = m_bookctrl->CalcSizeFromPage(wxSize());
sizeBorder.x += 5; sizeBorder.x += 5;
sizeBorder.y += 5; sizeBorder.y += 5;

View File

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

View File

@@ -322,7 +322,7 @@ bool wxCalendarCtrl::Create(wxWindow *parent,
// Since we don't paint the whole background make sure that the platform // Since we don't paint the whole background make sure that the platform
// will use the right one. // will use the right one.
SetBackgroundColour(GetBackgroundColour()); SetBackgroundColour(GetBackgroundColour());
SetHolidayAttrs(); SetHolidayAttrs();
return true; return true;
@@ -801,7 +801,7 @@ wxSize wxCalendarCtrl::DoGetBestSize() const
wxSize best(width, height); wxSize best(width, height);
CacheBestSize(best); CacheBestSize(best);
return best; return best;
} }
void wxCalendarCtrl::DoSetSize(int x, int y, void wxCalendarCtrl::DoSetSize(int x, int y,
@@ -975,7 +975,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
leftarrow[1] = wxPoint(arrowheight / 2, 0); leftarrow[1] = wxPoint(arrowheight / 2, 0);
leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1); leftarrow[2] = wxPoint(arrowheight / 2, arrowheight - 1);
rightarrow[0] = wxPoint(0, 0); rightarrow[0] = wxPoint();
rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2); rightarrow[1] = wxPoint(arrowheight / 2, arrowheight / 2);
rightarrow[2] = wxPoint(0, arrowheight - 1); rightarrow[2] = wxPoint(0, arrowheight - 1);
@@ -984,8 +984,7 @@ void wxCalendarCtrl::OnPaint(wxPaintEvent& WXUNUSED(event))
wxCoord arrowy = (m_heightRow - arrowheight) / 2; wxCoord arrowy = (m_heightRow - arrowheight) / 2;
wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2; wxCoord larrowx = (m_widthCol - (arrowheight / 2)) / 2;
wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6; wxCoord rarrowx = ((m_widthCol - (arrowheight / 2)) / 2) + m_widthCol*6;
m_leftArrowRect = wxRect(0, 0, 0, 0); m_leftArrowRect = m_rightArrowRect = wxRect();
m_rightArrowRect = wxRect(0, 0, 0, 0);
if ( AllowMonthChange() ) if ( AllowMonthChange() )
{ {

View File

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

View File

@@ -149,7 +149,7 @@ void wxGenericColourDialog::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data) bool wxGenericColourDialog::Create(wxWindow *parent, wxColourData *data)
{ {
if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"), if ( !wxDialog::Create(parent, wxID_ANY, _("Choose colour"),
wxPoint(0, 0), wxSize(900, 900)) ) wxPoint(), wxSize(900, 900)) )
return false; return false;
dialogParent = parent; dialogParent = parent;
@@ -493,15 +493,15 @@ void wxGenericColourDialog::OnBasicColourClick(int which)
PaintHighlight(dc, false); PaintHighlight(dc, false);
whichKind = 1; whichKind = 1;
colourSelection = which; colourSelection = which;
#if wxUSE_SLIDER #if wxUSE_SLIDER
redSlider->SetValue( standardColours[colourSelection].Red() ); redSlider->SetValue( standardColours[colourSelection].Red() );
greenSlider->SetValue( standardColours[colourSelection].Green() ); greenSlider->SetValue( standardColours[colourSelection].Green() );
blueSlider->SetValue( standardColours[colourSelection].Blue() ); blueSlider->SetValue( standardColours[colourSelection].Blue() );
#endif // wxUSE_SLIDER #endif // wxUSE_SLIDER
colourData.m_dataColour.Set(standardColours[colourSelection].Red(), colourData.m_dataColour.Set(standardColours[colourSelection].Red(),
standardColours[colourSelection].Green(), standardColours[colourSelection].Green(),
standardColours[colourSelection].Blue()); standardColours[colourSelection].Blue());
PaintCustomColour(dc); PaintCustomColour(dc);
@@ -514,17 +514,17 @@ void wxGenericColourDialog::OnCustomColourClick(int which)
PaintHighlight(dc, false); PaintHighlight(dc, false);
whichKind = 2; whichKind = 2;
colourSelection = which; colourSelection = which;
#if wxUSE_SLIDER #if wxUSE_SLIDER
redSlider->SetValue( customColours[colourSelection].Red() ); redSlider->SetValue( customColours[colourSelection].Red() );
greenSlider->SetValue( customColours[colourSelection].Green() ); greenSlider->SetValue( customColours[colourSelection].Green() );
blueSlider->SetValue( customColours[colourSelection].Blue() ); blueSlider->SetValue( customColours[colourSelection].Blue() );
#endif // wxUSE_SLIDER #endif // wxUSE_SLIDER
colourData.m_dataColour.Set(customColours[colourSelection].Red(), colourData.m_dataColour.Set(customColours[colourSelection].Red(),
customColours[colourSelection].Green(), customColours[colourSelection].Green(),
customColours[colourSelection].Blue()); customColours[colourSelection].Blue());
PaintCustomColour(dc); PaintCustomColour(dc);
PaintHighlight(dc, true); PaintHighlight(dc, true);
} }
@@ -553,10 +553,10 @@ void wxGenericColourDialog::OnAddCustom(wxCommandEvent& WXUNUSED(event))
PaintHighlight(dc, true); PaintHighlight(dc, true);
} }
customColours[colourSelection].Set(colourData.m_dataColour.Red(), customColours[colourSelection].Set(colourData.m_dataColour.Red(),
colourData.m_dataColour.Green(), colourData.m_dataColour.Green(),
colourData.m_dataColour.Blue()); colourData.m_dataColour.Blue());
colourData.SetCustomColour(colourSelection, customColours[colourSelection]); colourData.SetCustomColour(colourSelection, customColours[colourSelection]);
PaintCustomColours(dc); PaintCustomColours(dc);

View File

@@ -48,7 +48,7 @@
#include "wx/dateevt.h" #include "wx/dateevt.h"
#include "wx/generic/datectrl.h" #include "wx/generic/datectrl.h"
#include "wx/arrstr.h" #include "wx/arrstr.h"
#include "wx/calctrl.h" #include "wx/calctrl.h"
#include "wx/popupwin.h" #include "wx/popupwin.h"
#include "wx/renderer.h" #include "wx/renderer.h"
@@ -144,10 +144,10 @@ bool wxDatePickerCtrlGeneric::Create(wxWindow *parent,
m_popup->SetFont(GetFont()); m_popup->SetFont(GetFont());
wxPanel *panel=new wxPanel(m_popup, CTRLID_PAN, wxPanel *panel=new wxPanel(m_popup, CTRLID_PAN,
wxPoint(0, 0), wxDefaultSize, wxPoint(), wxDefaultSize,
wxSUNKEN_BORDER); wxSUNKEN_BORDER);
m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime, m_cal = new wxCalendarCtrl(panel, CTRLID_CAL, wxDefaultDateTime,
wxPoint(0,0), wxDefaultSize, wxPoint(), wxDefaultSize,
wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER); wxCAL_SHOW_HOLIDAYS | wxSUNKEN_BORDER);
m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED, m_cal->Connect(CTRLID_CAL, CTRLID_CAL, wxEVT_CALENDAR_SEL_CHANGED,
(wxObjectEventFunction) (wxObjectEventFunction)

View File

@@ -504,7 +504,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
Init(); Init();
long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT; long treeStyle = wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT;
#ifdef __WXGTK20__ #ifdef __WXGTK20__
treeStyle |= wxTR_NO_LINES; treeStyle |= wxTR_NO_LINES;
#endif #endif
@@ -524,7 +524,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
filterStyle |= wxBORDER_SUNKEN; filterStyle |= wxBORDER_SUNKEN;
m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL, m_treeCtrl = CreateTreeCtrl(this, wxID_TREECTRL,
wxPoint(0,0), GetClientSize(), treeStyle); wxPoint(), GetClientSize(), treeStyle);
if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS)) if (!filter.empty() && (style & wxDIRCTRL_SHOW_FILTERS))
m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle); m_filterListCtrl = new wxDirFilterListCtrl(this, wxID_FILTERLISTCTRL, wxDefaultPosition, wxDefaultSize, filterStyle);
@@ -553,7 +553,7 @@ bool wxGenericDirCtrl::Create(wxWindow *parent,
m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData); m_rootId = m_treeCtrl->AddRoot( rootName, 3, -1, rootData);
m_treeCtrl->SetItemHasChildren(m_rootId); m_treeCtrl->SetItemHasChildren(m_rootId);
ExpandDir(m_rootId); // automatically expand first level ExpandDir(m_rootId); // automatically expand first level
// Expand and select the default path // Expand and select the default path
if (!m_defaultPath.empty()) if (!m_defaultPath.empty())
{ {

View File

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

View File

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

View File

@@ -331,7 +331,7 @@ void wxHtmlListBox::OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const
if ( IsSelected(n) ) if ( IsSelected(n) )
{ {
wxHtmlSelection htmlSel; 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); htmlRendInfo.SetSelection(&htmlSel);
if ( m_htmlRendStyle ) if ( m_htmlRendStyle )
htmlRendInfo.SetStyle(m_htmlRendStyle); htmlRendInfo.SetStyle(m_htmlRendStyle);

View File

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

View File

@@ -3000,10 +3000,10 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
else else
{ {
// This is neccessary , because after a DnD operation in // This is neccessary , because after a DnD operation in
// from and to ourself, the up event is swallowed by the // from and to ourself, the up event is swallowed by the
// DnD code. So on next non-up event (which means here and // DnD code. So on next non-up event (which means here and
// now) m_lineSelectSingleOnUp should be reset. // now) m_lineSelectSingleOnUp should be reset.
m_lineSelectSingleOnUp = (size_t) -1; m_lineSelectSingleOnUp = (size_t) -1;
} }
if (event.RightDown()) if (event.RightDown())
{ {
@@ -3045,7 +3045,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
} }
else // multi sel & current is highlighted & no mod keys else // multi sel & current is highlighted & no mod keys
{ {
m_lineSelectSingleOnUp = current; m_lineSelectSingleOnUp = current;
ChangeCurrent(current); // change focus ChangeCurrent(current); // change focus
} }
} }
@@ -4645,7 +4645,7 @@ void wxGenericListCtrl::CreateHeaderWindow()
m_headerWin = new wxListHeaderWindow m_headerWin = new wxListHeaderWindow
( (
this, wxID_ANY, m_mainWin, this, wxID_ANY, m_mainWin,
wxPoint(0, 0), wxPoint(),
wxSize(GetClientSize().x, m_headerHeight), wxSize(GetClientSize().x, m_headerHeight),
wxTAB_TRAVERSAL wxTAB_TRAVERSAL
); );
@@ -4683,7 +4683,7 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
// don't create the inner window with the border // don't create the inner window with the border
style &= ~wxBORDER_MASK; 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__ #ifdef __WXMAC_CARBON__
// Human Interface Guidelines ask us for a special font in this case // Human Interface Guidelines ask us for a special font in this case

View File

@@ -699,7 +699,7 @@ bool wxGenericMDIClientWindow::CreateClient( wxGenericMDIParentFrame *parent, lo
{ {
SetWindowStyleFlag(style); 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) if (success)
{ {
/* /*

View File

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

View File

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

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): 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. // At least for GTK+ 2.0, this hint is not available.
#if defined(__WXGTK20__) #if defined(__WXGTK20__)
@@ -62,7 +62,7 @@ wxSplashScreen::wxSplashScreen(const wxBitmap& bitmap, long splashStyle, int mil
GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
#endif #endif
#endif #endif
m_window = NULL; m_window = NULL;
m_splashStyle = splashStyle; m_splashStyle = splashStyle;
m_milliseconds = milliseconds; m_milliseconds = milliseconds;

View File

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

View File

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