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

fixes as per http://thread.gmane.org/gmane.comp.lib.wxwidgets.devel/92325

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Chris Elliott
2007-10-10 07:44:34 +00:00
parent 47b4bc1768
commit 1583600031
6 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/controls/controls.cpp
View File

@@ -1314,8 +1314,9 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
static const wxChar *GetDataString(wxClientData *data) static const wxChar *GetDataString(wxClientData *data)
{ {
return data ? wx_static_cast(wxStringClientData *, data)->GetData().c_str() return (
: _T("none"); data ? wx_static_cast(wxStringClientData *, data)->GetData() : wxString("none")
).c_str();
} }
void MyPanel::OnChoice( wxCommandEvent &event ) void MyPanel::OnChoice( wxCommandEvent &event )

4
samples/grid/griddemo.cpp
View File

@@ -961,8 +961,8 @@ void GridFrame::OnShowSelection(wxCommandEvent& WXUNUSED(event))
single = _T("column"); single = _T("column");
} }
const wxArrayInt sels(rows ? grid->GetSelectedRows() const wxArrayInt sels((const wxArrayInt)(rows ? grid->GetSelectedRows()
: grid->GetSelectedCols()); : grid->GetSelectedCols()));
size_t count = sels.size(); size_t count = sels.size();
wxLogMessage(_T("%lu %s selected:"), wxLogMessage(_T("%lu %s selected:"),
(unsigned long)count, plural); (unsigned long)count, plural);

8
samples/listctrl/listtest.cpp
View File

@@ -821,8 +821,12 @@ void MyListCtrl::OnBeginLabelEdit(wxListEvent& event)
void MyListCtrl::OnEndLabelEdit(wxListEvent& event) void MyListCtrl::OnEndLabelEdit(wxListEvent& event)
{ {
wxLogMessage( wxT("OnEndLabelEdit: %s"), wxLogMessage( wxT("OnEndLabelEdit: %s"),
event.IsEditCancelled() ? _T("[cancelled]") (
: event.m_item.m_text.c_str()); event.IsEditCancelled() ?
wxString("[cancelled]") :
event.m_item.m_text
).c_str()
);
} }
void MyListCtrl::OnDeleteItem(wxListEvent& event) void MyListCtrl::OnDeleteItem(wxListEvent& event)

9
samples/mdi/mdi.cpp
View File

@@ -516,8 +516,13 @@ void MyChild::OnPaste(wxCommandEvent& WXUNUSED(event))
{ {
wxClipboardLocker lock; wxClipboardLocker lock;
wxTextDataObject data; wxTextDataObject data;
canvas->SetText(wxTheClipboard->GetData(data) ? data.GetText().c_str() canvas->SetText(
: _T("No text on clipboard")); (
wxTheClipboard->GetData(data) ?
data.GetText() :
wxString("No text on clipboard")
).c_str()
);
} }
void MyChild::OnUpdatePaste(wxUpdateUIEvent& event) void MyChild::OnUpdatePaste(wxUpdateUIEvent& event)

2
samples/mediaplayer/mediaplayer.cpp
View File

@@ -428,7 +428,7 @@ bool wxMediaPlayerApp::OnInit()
cmdLineDesc[0].kind = wxCMD_LINE_PARAM; cmdLineDesc[0].kind = wxCMD_LINE_PARAM;
cmdLineDesc[0].shortName = NULL; cmdLineDesc[0].shortName = NULL;
cmdLineDesc[0].longName = NULL; cmdLineDesc[0].longName = NULL;
cmdLineDesc[0].description = wxT("input files"); cmdLineDesc[0].description = "input files";
cmdLineDesc[0].type = wxCMD_LINE_VAL_STRING; cmdLineDesc[0].type = wxCMD_LINE_VAL_STRING;
cmdLineDesc[0].flags = wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE; cmdLineDesc[0].flags = wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE;

7
samples/typetest/typetest.cpp
View File

@@ -955,11 +955,10 @@ void MyApp::DoMIMEDemo(wxCommandEvent& WXUNUSED(event))
filetype->GetOpenCommand(&open, params); filetype->GetOpenCommand(&open, params);
textCtrl << _T("MIME information about extension '") << ext << _T('\n') textCtrl << _T("MIME information about extension '") << ext << _T('\n')
<< _T("\tMIME type: ") << ( !type ? wxT("unknown") << _T("\tMIME type: ") << ( !type ? wxString("unknown") : type ) << _T('\n')
: type.c_str() ) << _T('\n') << _T("\tDescription: ") << ( !desc ? wxString(wxEmptyString) : desc )
<< _T("\tDescription: ") << ( !desc ? wxEmptyString : desc.c_str() )
<< _T('\n') << _T('\n')
<< _T("\tCommand to open: ") << ( !open ? wxT("no") : open.c_str() ) << _T("\tCommand to open: ") << ( !open ? wxString("no") : open )
<< _T('\n'); << _T('\n');
delete filetype; delete filetype;