Unicode compatibility
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -49,7 +49,7 @@ protected:
|
||||
wxTextCtrl* CreateTextCtrl( const wxString& value );
|
||||
|
||||
public:
|
||||
MyFrame( wxWindow* parent, char *title );
|
||||
MyFrame( wxWindow* parent, const wxChar *title );
|
||||
~MyFrame();
|
||||
|
||||
void OnLoad( wxCommandEvent& event );
|
||||
@@ -69,19 +69,19 @@ bool MyApp::OnInit(void)
|
||||
{
|
||||
// wxWindows boiler-plate:
|
||||
|
||||
MyFrame *frame = new MyFrame(NULL, "wxFrameLayout sample");
|
||||
MyFrame *frame = new MyFrame(NULL, _("wxFrameLayout sample"));
|
||||
|
||||
wxMenu *file_menu = new wxMenu;
|
||||
|
||||
file_menu->Append( ID_LOAD, "&Load layout" );
|
||||
file_menu->Append( ID_STORE, "&Store layout" );
|
||||
file_menu->Append( ID_LOAD, _("&Load layout") );
|
||||
file_menu->Append( ID_STORE, _("&Store layout") );
|
||||
file_menu->AppendSeparator();
|
||||
|
||||
file_menu->Append( ID_QUIT, "E&xit" );
|
||||
file_menu->Append( ID_QUIT, _("E&xit") );
|
||||
|
||||
wxMenuBar *menu_bar = new wxMenuBar;
|
||||
|
||||
menu_bar->Append(file_menu, "&File");
|
||||
menu_bar->Append(file_menu, _("&File"));
|
||||
|
||||
frame->CreateStatusBar(3);
|
||||
frame->SetMenuBar(menu_bar);
|
||||
@@ -101,16 +101,16 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_MENU( ID_QUIT, MyFrame::OnQuit )
|
||||
END_EVENT_TABLE()
|
||||
|
||||
MyFrame::MyFrame( wxWindow* parent, char *title )
|
||||
: wxFrame( parent, -1, "NewTest-II", wxDefaultPosition,
|
||||
MyFrame::MyFrame( wxWindow* parent, const wxChar *title )
|
||||
: wxFrame( parent, -1, _("NewTest-II"), wxDefaultPosition,
|
||||
wxSize( 700, 500 ),
|
||||
wxCLIP_CHILDREN | wxMINIMIZE_BOX | wxMAXIMIZE_BOX |
|
||||
wxTHICK_FRAME | wxSYSTEM_MENU | wxCAPTION,
|
||||
"freimas" )
|
||||
wxT("freimas") )
|
||||
{
|
||||
mpInternalFrm = (wxPanel*)this;
|
||||
|
||||
mpClientWnd = CreateTextCtrl( "Client window" );
|
||||
mpClientWnd = CreateTextCtrl( _("Client window") );
|
||||
|
||||
// btw, creation of internal frame is needed for wxGtk version
|
||||
// to act correctly (since menu-bar is a separate window there..)
|
||||
@@ -142,14 +142,14 @@ MyFrame::MyFrame( wxWindow* parent, char *title )
|
||||
// drop-in 20 bars
|
||||
for( int i = 1; i <= 20; ++i )
|
||||
{
|
||||
char buf[4];
|
||||
sprintf( buf, "%d", i );
|
||||
wxString name = wxString("Bar-");
|
||||
wxChar buf[4];
|
||||
wxSprintf( buf, wxT("%d"), i );
|
||||
wxString name = wxString(wxT("Bar-"));
|
||||
name += buf;
|
||||
|
||||
sizes.mIsFixed = i % 5 > 0; // every fifth bar is not fixed-size
|
||||
|
||||
if ( !sizes.mIsFixed ) name += " (flexible)";
|
||||
if ( !sizes.mIsFixed ) name += wxT(" (flexible)");
|
||||
|
||||
mpLayout->AddBar( CreateTextCtrl(name),// bar window
|
||||
sizes, i % MAX_PANES,// alignment ( 0-top,1-bottom, etc)
|
||||
@@ -179,12 +179,12 @@ wxTextCtrl* MyFrame::CreateTextCtrl( const wxString& value )
|
||||
|
||||
void MyFrame::OnLoad( wxCommandEvent& event )
|
||||
{
|
||||
wxMessageBox("Hey - you found a BIG question-mark !!");
|
||||
wxMessageBox(wxT("Hey - you found a BIG question-mark !!"));
|
||||
}
|
||||
|
||||
void MyFrame::OnStore( wxCommandEvent& event )
|
||||
{
|
||||
wxMessageBox("Hey - you found another BIG question-mark !!");
|
||||
wxMessageBox(wxT("Hey - you found another BIG question-mark !!"));
|
||||
}
|
||||
|
||||
void MyFrame::OnQuit( wxCommandEvent& event )
|
||||
|
Reference in New Issue
Block a user