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

Minor decorations.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-02-08 13:02:34 +00:00
parent 6b99f53e39
commit 9548f38086
5 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/generic/filedlgg.cpp
View File

@@ -995,7 +995,7 @@ bool wxGenericFileDialog::Create( wxWindow *parent,
style2 |= wxLC_SINGLE_SEL; style2 |= wxLC_SINGLE_SEL;
m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_list = new wxFileCtrl( this, ID_LIST_CTRL,
_T(""), ms_lastShowHidden, wxEmptyString, ms_lastShowHidden,
wxDefaultPosition, wxSize(540,200), wxDefaultPosition, wxSize(540,200),
style2); style2);

16
src/generic/prntdlgg.cpp
View File

@@ -82,7 +82,7 @@ IMPLEMENT_CLASS(wxPostScriptPrintNativeData, wxPrintNativeDataBase)
wxPostScriptPrintNativeData::wxPostScriptPrintNativeData() wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
{ {
m_previewCommand = wxT(""); m_previewCommand = wxEmptyString;
#ifdef __VMS__ #ifdef __VMS__
m_printerCommand = wxT("print"); m_printerCommand = wxT("print");
m_printerOptions = wxT("/nonotify/queue=psqueue"); m_printerOptions = wxT("/nonotify/queue=psqueue");
@@ -91,14 +91,14 @@ wxPostScriptPrintNativeData::wxPostScriptPrintNativeData()
#ifdef __WXMSW__ #ifdef __WXMSW__
m_printerCommand = wxT("print"); m_printerCommand = wxT("print");
m_printerOptions = wxT(""); m_printerOptions = wxEmptyString;
m_afmPath = wxT("c:\\windows\\system\\"); m_afmPath = wxT("c:\\windows\\system\\");
#endif #endif
#if !defined(__VMS__) && !defined(__WXMSW__) #if !defined(__VMS__) && !defined(__WXMSW__)
m_printerCommand = wxT("lpr"); m_printerCommand = wxT("lpr");
m_printerOptions = wxT(""); m_printerOptions = wxEmptyString;
m_afmPath = wxT(""); m_afmPath = wxEmptyString);
#endif #endif
m_printerScaleX = 1.0; m_printerScaleX = 1.0;
@@ -565,7 +565,7 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
wxStringTokenizer tok2( tmp, wxT(" ") ); wxStringTokenizer tok2( tmp, wxT(" ") );
tmp = tok2.GetNextToken(); // "printer" tmp = tok2.GetNextToken(); // "printer"
tmp = tok2.GetNextToken(); // "hp_deskjet930c" tmp = tok2.GetNextToken(); // "hp_deskjet930c"
tmp = wxT(""); tmp = wxEmptyString;
while (tok2.HasMoreTokens()) while (tok2.HasMoreTokens())
{ {
tmp += tok2.GetNextToken(); tmp += tok2.GetNextToken();
@@ -629,7 +629,7 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
item13->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 ); item13->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
m_printerCommandText = new wxTextCtrl( this, wxPRINTID_COMMAND, wxT(""), wxDefaultPosition, wxSize(160,wxDefaultCoord) ); m_printerCommandText = new wxTextCtrl( this, wxPRINTID_COMMAND, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
item13->Add( m_printerCommandText, 0, wxALIGN_CENTER|wxALL, 5 ); item13->Add( m_printerCommandText, 0, wxALIGN_CENTER|wxALL, 5 );
item10->Add( item13, 0, wxALIGN_CENTER|wxALL, 0 ); item10->Add( item13, 0, wxALIGN_CENTER|wxALL, 0 );
@@ -641,7 +641,7 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
item16->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 ); item16->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxT(""), wxDefaultPosition, wxSize(160,wxDefaultCoord) ); m_printerOptionsText = new wxTextCtrl( this, wxPRINTID_OPTIONS, wxEmptyString, wxDefaultPosition, wxSize(160,wxDefaultCoord) );
item16->Add( m_printerOptionsText, 0, wxALIGN_CENTER|wxALL, 5 ); item16->Add( m_printerOptionsText, 0, wxALIGN_CENTER|wxALL, 5 );
item10->Add( item16, 0, wxALIGN_CENTER|wxALL, 0 ); item10->Add( item16, 0, wxALIGN_CENTER|wxALL, 0 );
@@ -732,7 +732,7 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
long id = m_printerListCtrl->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED ); long id = m_printerListCtrl->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
if (id == 0) if (id == 0)
{ {
m_printData.SetPrinterName( wxT("") ); m_printData.SetPrinterName( wxEmptyString );
} }
else else
{ {

2
src/generic/treectlg.cpp
View File

@@ -914,7 +914,7 @@ void wxGenericTreeCtrl::SetWindowStyle(const long styles)
wxString wxGenericTreeCtrl::GetItemText(const wxTreeItemId& item) const wxString wxGenericTreeCtrl::GetItemText(const wxTreeItemId& item) const
{ {
wxCHECK_MSG( item.IsOk(), wxT(""), wxT("invalid tree item") ); wxCHECK_MSG( item.IsOk(), wxEmptyString, wxT("invalid tree item") );
return ((wxGenericTreeItem*) item.m_pItem)->GetText(); return ((wxGenericTreeItem*) item.m_pItem)->GetText();
} }

4
src/html/htmlctrl/webkit/webkit.mm
View File

@@ -113,7 +113,7 @@ bool wxWebKitCtrl::Create(wxWindow *parent,
/* /*
int width, height; int width, height;
wxSize sizeInstance; wxSize sizeInstance;
if (size.x == -1 || size.y == -1) if (size.x == wxDefaultCoord || size.y == wxDefaultCoord)
{ {
m_parent->GetClientSize(&width, &height); m_parent->GetClientSize(&width, &height);
sizeInstance.x = width; sizeInstance.x = width;
@@ -242,7 +242,7 @@ wxString wxWebKitCtrl::GetPageSource(){
return wxStringWithNSString( [[dataSource representation] documentSource] ); return wxStringWithNSString( [[dataSource representation] documentSource] );
} }
return wxT(""); return wxEmptyString;
} }
void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){ void wxWebKitCtrl::SetPageSource(wxString& source, const wxString& baseUrl){

2
src/html/winpars.cpp
View File

@@ -193,7 +193,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
*/ */
m_UseLink = false; m_UseLink = false;
m_Link = wxHtmlLinkInfo( wxT(""), wxT("") ); m_Link = wxHtmlLinkInfo( wxEmptyString );
m_LinkColor.Set(0, 0, 0xFF); m_LinkColor.Set(0, 0, 0xFF);
m_ActualColor.Set(0, 0, 0); m_ActualColor.Set(0, 0, 0);
m_Align = wxHTML_ALIGN_LEFT; m_Align = wxHTML_ALIGN_LEFT;