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

Various cleanings.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-11 10:42:05 +00:00
parent 7b9472b9c8
commit 8b5d5223d1
17 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/event.h
View File

@@ -1523,7 +1523,7 @@ public:
int joystick = wxJOYSTICK1,
int change = 0)
: wxEvent(0, type),
m_pos(0, 0),
m_pos(),
m_zPosition(0),
m_buttonChange(change),
m_buttonState(state),

14
include/wx/mediactrl.h
View File

@@ -113,11 +113,11 @@ public:
{ }
wxMediaCtrl(wxWindow* parent, wxWindowID winid,
const wxString& fileName = wxT(""),
const wxString& fileName = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& szBackend = wxT(""),
const wxString& szBackend = wxEmptyString,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("mediaCtrl"))
: m_imp(NULL), m_bLoaded(false), m_bLoop(false)
@@ -129,7 +129,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& szBackend = wxT(""),
const wxString& szBackend = wxEmptyString,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("mediaCtrl"))
: m_imp(NULL), m_bLoop(false)
@@ -139,11 +139,11 @@ public:
~wxMediaCtrl();
bool Create(wxWindow* parent, wxWindowID winid,
const wxString& fileName = wxT(""),
const wxString& fileName = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& szBackend = wxT(""),
const wxString& szBackend = wxEmptyString,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("mediaCtrl"));
@@ -152,7 +152,7 @@ public:
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = 0,
const wxString& szBackend = wxT(""),
const wxString& szBackend = wxEmptyString,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxT("mediaCtrl")); //DirectShow only
@@ -252,7 +252,7 @@ public:
int WXUNUSED(w), int WXUNUSED(h))
{ }
virtual wxSize GetVideoSize() const
{ return wxSize(0,0); }
{ return wxSize(); }
virtual double GetPlaybackRate()
{ return 0.0; }

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(0, 0), m_canvas->GetClientSize());
SetClippingRegion(wxPoint(), m_canvas->GetClientSize());
#endif // __WXUNIVERSAL__ || __WXWINCE__
}

8
src/msw/font.cpp
View File

@@ -108,8 +108,8 @@ public:
// constructors
wxFontRefData()
{
Init(-1, wxSize(0, 0), FALSE, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL, FALSE, wxEmptyString,
Init(-1, wxSize(), false, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL, false, wxEmptyString,
wxFONTENCODING_DEFAULT);
}
@@ -223,7 +223,7 @@ public:
else
{
m_pointSize = pointSize;
m_sizeUsingPixels = FALSE;
m_sizeUsingPixels = false;
}
}
@@ -236,7 +236,7 @@ public:
else
{
m_pixelSize = pixelSize;
m_sizeUsingPixels = TRUE;
m_sizeUsingPixels = true;
}
}

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(0, 0);
return wxPoint();
}
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(0,0);
return wxSize();
}
//---------------------------------------------------------------------------

4
src/msw/notebook.cpp
View File

@@ -480,7 +480,7 @@ wxSize wxNotebook::CalcSizeFromPage(const wxSize& sizePage) const
wxSize sizeTotal = sizePage;
// We need to make getting tab size part of the wxWidgets API.
wxSize tabSize(0, 0);
wxSize tabSize;
if (GetPageCount() > 0)
{
RECT rect;
@@ -627,7 +627,7 @@ bool wxNotebook::InsertPage(size_t nPage,
}
// and the text
if ( !strText.IsEmpty() )
if ( !strText.empty() )
{
tcItem.mask |= TCIF_TEXT;
tcItem.pszText = (wxChar *)strText.c_str(); // const_cast

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(0,0) );
data.SetPaperSize( wxSize() );
}
}
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(0,0) );
data.SetPaperSize( wxSize() );
}
}
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(0,0) );
data.SetPaperSize( wxSize() );
}
//// 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(0, 0), this);
m_dragImage->BeginDrag(wxPoint(), this);
m_dragImage->Show();
}
break;

6
src/msw/window.cpp
View File

@@ -306,9 +306,9 @@ wxBEGIN_PROPERTIES_TABLE(wxWindow)
wxPROPERTY( Shown , bool , Show , IsShown , wxxVariant((bool)true) , 0 /*flags*/ , wxT("Helpstring") , wxT("group"))
#if 0
// possible property candidates (not in xrc) or not valid in all subclasses
wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxT("") )
wxPROPERTY( Title,wxString, SetTitle, GetTitle, wxEmptyString )
wxPROPERTY( Font , wxFont , SetFont , GetWindowFont , )
wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxT("") )
wxPROPERTY( Label,wxString, SetLabel, GetLabel, wxEmptyString )
// MaxHeight, Width , MinHeight , Width
// TODO switch label to control and title to toplevels
@@ -2781,7 +2781,7 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
wxHelpEvent helpEvent(wxEVT_HELP,
subjectOfHelp->GetId(),
#ifdef __WXWINCE__
wxPoint(0, 0)
wxPoint()
#else
wxPoint(info->MousePos.x, info->MousePos.y)
#endif

2
src/univ/combobox.cpp
View File

@@ -328,7 +328,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(0,0);
wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
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(0, 0));
menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize());
// 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/notebook.cpp
View File

@@ -1253,7 +1253,7 @@ void wxNotebook::ScrollLastTo(int page)
wxSize wxNotebook::DoGetBestClientSize() const
{
// calculate the max page size
wxSize size(0, 0);
wxSize size;
size_t count = GetPageCount();
if ( count )

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(0,0);
wxPoint clientOrigin = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
x0 += ptOrigin.x + BOX_BORDER_X - clientOrigin.x;
y0 += ptOrigin.y + BOX_BORDER_Y - clientOrigin.y;

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

@@ -449,7 +449,7 @@ protected:
const wxString& label,
int flags,
int indexAccel,
const wxString& accel = _T(""),
const wxString& accel = wxEmptyString,
const wxBitmap& bitmap = wxNullBitmap,
const wxGTKMenuGeometryInfo *geometryInfo = NULL);
@@ -1334,7 +1334,7 @@ void wxGTKRenderer::DrawCheckItem(wxDC& dc,
rectBitmap.width = GetCheckBitmapSize().x;
// never draw the focus rect around the check indicators here
DrawCheckButton(dc, _T(""), bitmap, rectBitmap, flags & ~wxCONTROL_FOCUSED);
DrawCheckButton(dc, wxEmptyString, bitmap, rectBitmap, flags & ~wxCONTROL_FOCUSED);
wxRect rectLabel = rect;
wxCoord shift = rectBitmap.width + 2*GetCheckItemMargin();
@@ -2326,7 +2326,7 @@ wxMenuGeometryInfo *wxGTKRenderer::GetMenuGeometry(wxWindow *win,
wxSize
wxGTKRenderer::GetStatusBarBorders(wxCoord * WXUNUSED(borderBetweenFields)) const
{
return wxSize(0, 0);
return wxSize();
}
void wxGTKRenderer::DrawStatusField(wxDC& WXUNUSED(dc),
@@ -2913,7 +2913,7 @@ wxGTKRenderer::GetFrameTotalSize(const wxSize& clientSize,
wxSize wxGTKRenderer::GetFrameMinSize(int WXUNUSED(flags)) const
{
return wxSize(0,0);
return wxSize();
}
wxSize wxGTKRenderer::GetFrameIconSize() const

2
src/univ/themes/win32.cpp
View File

@@ -3932,7 +3932,7 @@ wxSize wxWin32Renderer::GetFrameTotalSize(const wxSize& clientSize,
wxSize wxWin32Renderer::GetFrameMinSize(int flags) const
{
wxSize s(0, 0);
wxSize s;
if ( (flags & wxTOPLEVEL_BORDER) && !(flags & wxTOPLEVEL_MAXIMIZED) )
{

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(0, 0), size, &dc, ptSource
dcMem.Blit(wxPoint(), size, &dc, ptSource
#if defined(__WXGTK__) && !defined(wxHAS_WORKING_GTK_DC_BLIT)
+ GetClientAreaOrigin()
#endif // broken wxGTK wxDC::Blit
);
dc.Blit(ptDest, size, &dcMem, wxPoint(0, 0));
dc.Blit(ptDest, size, &dcMem, wxPoint());
wxLogTrace(_T("scroll"),
_T("Blit: (%d, %d) of size %dx%d -> (%d, %d)"),