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

Various warning and Unicode fixes from ABX.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-09-09 20:24:34 +00:00
parent 432afc17f0
commit 87728739f2
25 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
samples/wxtest/test.cpp
View File

@@ -77,7 +77,7 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title,
CreateMyMenuBar();
CreateStatusBar(1);
SetStatusText( "Welcome!" );
SetStatusText( _T("Welcome!") );
// insert main window here
}
@@ -93,25 +93,25 @@ void MyFrame::CreateMyMenuBar()
// WDR: handler implementations for MyFrame
void MyFrame::OnTest( wxCommandEvent &event )
void MyFrame::OnTest( wxCommandEvent &WXUNUSED(event) )
{
MyDialog dialog( this, -1, "Test" );
MyDialog dialog( this, -1, _T("Test") );
dialog.ShowModal();
}
void MyFrame::OnAbout( wxCommandEvent &event )
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
{
wxMessageDialog dialog( this, "Welcome to SuperApp 1.0\n(C)opyright Joe Hacker",
"About SuperApp", wxOK|wxICON_INFORMATION );
wxMessageDialog dialog( this, _T("Welcome to SuperApp 1.0\n(C)opyright Joe Hacker"),
_T("About SuperApp"), wxOK|wxICON_INFORMATION );
dialog.ShowModal();
}
void MyFrame::OnQuit( wxCommandEvent &event )
void MyFrame::OnQuit( wxCommandEvent &WXUNUSED(event) )
{
Close( TRUE );
}
void MyFrame::OnCloseWindow( wxCloseEvent &event )
void MyFrame::OnCloseWindow( wxCloseEvent &WXUNUSED(event) )
{
// if ! saved changes -> return
@@ -130,7 +130,7 @@ MyApp::MyApp()
bool MyApp::OnInit()
{
MyFrame *frame = new MyFrame( NULL, -1, "SuperApp", wxPoint(20,20), wxSize(500,340) );
MyFrame *frame = new MyFrame( NULL, -1, _T("SuperApp"), wxPoint(20,20), wxSize(500,340) );
frame->Show( TRUE );
return TRUE;

12
samples/wxtest/test_wdr.cpp
View File

@@ -24,12 +24,12 @@ wxSizer *MyDialogFunc( wxWindow *parent, bool call_fit, bool set_sizer )
{
wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
wxStaticBox *item2 = new wxStaticBox( parent, -1, "Text" );
wxStaticBox *item2 = new wxStaticBox( parent, -1, _T("Text") );
wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
wxTextCtrl *item4 = new wxTextCtrl( parent, ID_TEXTCTRL, "", wxDefaultPosition, wxSize(80,-1), 0 );
wxTextCtrl *item4 = new wxTextCtrl( parent, ID_TEXTCTRL, wxEmptyString, wxDefaultPosition, wxSize(80,-1), 0 );
item3->Add( item4, 0, wxALIGN_CENTRE|wxALL, 5 );
item1->Add( item3, 0, wxALIGN_CENTRE|wxALL, 5 );
@@ -57,10 +57,10 @@ wxMenuBar *MyMenuBarFunc()
wxMenuBar *item0 = new wxMenuBar;
wxMenu* item1 = new wxMenu;
item1->Append( ID_ABOUT, "About...\tF1", "" );
item1->Append( ID_TEST, "Test...\tF2", "" );
item1->Append( ID_QUIT, "Quit\tCtrl-Q", "" );
item0->Append( item1, "File" );
item1->Append( ID_ABOUT, _T("About...\tF1"), wxEmptyString );
item1->Append( ID_TEST, _T("Test...\tF2"), wxEmptyString );
item1->Append( ID_QUIT, _T("Quit\tCtrl-Q"), wxEmptyString );
item0->Append( item1, _T("File") );
return item0;
}