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

Make some of the samples compile in Unicode mode.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2002-12-13 21:33:14 +00:00
parent c17ba76f38
commit 9f84eccdea
10 changed files with 374 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/artprov/artbrows.cpp
View File

@@ -33,7 +33,7 @@
#include "artbrows.h" #include "artbrows.h"
#define ART_CLIENT(id) \ #define ART_CLIENT(id) \
choice->Append(#id, (void*)id); choice->Append(_T(#id), (void*)id);
#define ART_ICON(id) \ #define ART_ICON(id) \
{ \ { \
int ind; \ int ind; \
@@ -42,7 +42,7 @@
ind = images->Add(icon); \ ind = images->Add(icon); \
else \ else \
ind = 0; \ ind = 0; \
list->InsertItem(index, #id, ind); \ list->InsertItem(index, _T(#id), ind); \
list->SetItemData(index, (long)id); \ list->SetItemData(index, (long)id); \
index++; \ index++; \
} }

40
samples/calendar/calendar.cpp
View File

@@ -186,7 +186,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
// Create the main application window // Create the main application window
MyFrame *frame = new MyFrame("Calendar wxWindows sample", MyFrame *frame = new MyFrame(_T("Calendar wxWindows sample"),
wxPoint(50, 50), wxSize(450, 340)); wxPoint(50, 50), wxSize(450, 340));
frame->Show(TRUE); frame->Show(TRUE);
@@ -208,41 +208,41 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar // create a menu bar
wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu;
menuFile->Append(Calendar_File_About, "&About...\tCtrl-A", "Show about dialog"); menuFile->Append(Calendar_File_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Calendar_File_Quit, "E&xit\tAlt-X", "Quit this program"); menuFile->Append(Calendar_File_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
wxMenu *menuCal = new wxMenu; wxMenu *menuCal = new wxMenu;
menuCal->Append(Calendar_Cal_Monday, menuCal->Append(Calendar_Cal_Monday,
"Monday &first weekday\tCtrl-F", _T("Monday &first weekday\tCtrl-F"),
"Toggle between Mon and Sun as the first week day", _T("Toggle between Mon and Sun as the first week day"),
TRUE); TRUE);
menuCal->Append(Calendar_Cal_Holidays, "Show &holidays\tCtrl-H", menuCal->Append(Calendar_Cal_Holidays, _T("Show &holidays\tCtrl-H"),
"Toggle highlighting the holidays", _T("Toggle highlighting the holidays"),
TRUE); TRUE);
menuCal->Append(Calendar_Cal_Special, "Highlight &special dates\tCtrl-S", menuCal->Append(Calendar_Cal_Special, _T("Highlight &special dates\tCtrl-S"),
"Test custom highlighting", _T("Test custom highlighting"),
TRUE); TRUE);
menuCal->Append(Calendar_Cal_SurroundWeeks, menuCal->Append(Calendar_Cal_SurroundWeeks,
"Show s&urrounding weeks\tCtrl-W", _T("Show s&urrounding weeks\tCtrl-W"),
"Show the neighbouring weeks in the prev/next month", _T("Show the neighbouring weeks in the prev/next month"),
TRUE); TRUE);
menuCal->AppendSeparator(); menuCal->AppendSeparator();
menuCal->Append(Calendar_Cal_SeqMonth, menuCal->Append(Calendar_Cal_SeqMonth,
"To&ggle month selector style\tCtrl-G", _T("To&ggle month selector style\tCtrl-G"),
"Use another style for the calendar controls", _T("Use another style for the calendar controls"),
TRUE); TRUE);
menuCal->Append(Calendar_Cal_Month, "&Month can be changed\tCtrl-M", menuCal->Append(Calendar_Cal_Month, _T("&Month can be changed\tCtrl-M"),
"Allow changing the month in the calendar", _T("Allow changing the month in the calendar"),
TRUE); TRUE);
menuCal->Append(Calendar_Cal_Year, "&Year can be changed\tCtrl-Y", menuCal->Append(Calendar_Cal_Year, _T("&Year can be changed\tCtrl-Y"),
"Allow changing the year in the calendar", _T("Allow changing the year in the calendar"),
TRUE); TRUE);
// now append the freshly created menu to the menu bar... // now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar; wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, "&File"); menuBar->Append(menuFile, _T("&File"));
menuBar->Append(menuCal, "&Calendar"); menuBar->Append(menuCal, _T("&Calendar"));
menuBar->Check(Calendar_Cal_Monday, TRUE); menuBar->Check(Calendar_Cal_Monday, TRUE);
menuBar->Check(Calendar_Cal_Holidays, TRUE); menuBar->Check(Calendar_Cal_Holidays, TRUE);
@@ -257,7 +257,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
#if wxUSE_STATUSBAR #if wxUSE_STATUSBAR
// create a status bar just for fun (by default with 1 pane only) // create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2); CreateStatusBar(2);
SetStatusText("Welcome to wxWindows!"); SetStatusText(_T("Welcome to wxWindows!"));
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }

14
samples/caret/caret.cpp
View File

@@ -176,7 +176,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
// create and show the main application window // create and show the main application window
MyFrame *frame = new MyFrame("Caret wxWindows sample", MyFrame *frame = new MyFrame(_T("Caret wxWindows sample"),
wxPoint(50, 50), wxSize(450, 340)); wxPoint(50, 50), wxSize(450, 340));
frame->Show(TRUE); frame->Show(TRUE);
@@ -201,16 +201,16 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar // create a menu bar
wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu;
menuFile->Append(Caret_SetBlinkTime, "&Blink time...\tCtrl-B"); menuFile->Append(Caret_SetBlinkTime, _T("&Blink time...\tCtrl-B"));
menuFile->Append(Caret_Move, "&Move caret\tCtrl-C"); menuFile->Append(Caret_Move, _T("&Move caret\tCtrl-C"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Caret_About, "&About...\tCtrl-A", "Show about dialog"); menuFile->Append(Caret_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Caret_Quit, "E&xit\tAlt-X", "Quit this program"); menuFile->Append(Caret_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
// now append the freshly created menu to the menu bar... // now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar; wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, "&File"); menuBar->Append(menuFile, _T("&File"));
// ... and attach this menu bar to the frame // ... and attach this menu bar to the frame
SetMenuBar(menuBar); SetMenuBar(menuBar);
@@ -219,7 +219,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a status bar just for fun (by default with 1 pane only) // create a status bar just for fun (by default with 1 pane only)
CreateStatusBar(2); CreateStatusBar(2);
SetStatusText("Welcome to wxWindows!"); SetStatusText(_T("Welcome to wxWindows!"));
} }

2
samples/checklst/checklst.cpp
View File

@@ -46,7 +46,7 @@ class CheckListBoxFrame : public wxFrame
{ {
public: public:
// ctor & dtor // ctor & dtor
CheckListBoxFrame(wxFrame *frame, const char *title, CheckListBoxFrame(wxFrame *frame, const wxChar *title,
int x, int y, int w, int h); int x, int y, int w, int h);
virtual ~CheckListBoxFrame(); virtual ~CheckListBoxFrame();

64
samples/config/conftest.cpp
View File

@@ -95,8 +95,8 @@ bool MyApp::OnInit()
// of the config file/registry key and must be set before the first call // of the config file/registry key and must be set before the first call
// to Get() if you want to override the default values (the application // to Get() if you want to override the default values (the application
// name is the name of the executable and the vendor name is the same) // name is the name of the executable and the vendor name is the same)
SetVendorName("wxWindows"); SetVendorName(_T("wxWindows"));
SetAppName("conftest"); // not needed, it's the default value SetAppName(_T("conftest")); // not needed, it's the default value
wxConfigBase *pConfig = wxConfigBase::Get(); wxConfigBase *pConfig = wxConfigBase::Get();
@@ -118,11 +118,11 @@ bool MyApp::OnInit()
SetTopWindow(frame); SetTopWindow(frame);
// use our config object... // use our config object...
if ( pConfig->Read("/Controls/Check", 1l) != 0 ) { if ( pConfig->Read(_T("/Controls/Check"), 1l) != 0 ) {
wxMessageBox("You can disable this message box by unchecking\n" wxMessageBox(_T("You can disable this message box by unchecking\n")
"the checkbox in the main window (of course, a real\n" _T("the checkbox in the main window (of course, a real\n")
"program would have a checkbox right here but we\n" _T("program would have a checkbox right here but we\n")
"keep it simple)", "Welcome to wxConfig demo", _T("keep it simple)"), _T("Welcome to wxConfig demo"),
wxICON_INFORMATION | wxOK); wxICON_INFORMATION | wxOK);
} }
@@ -145,28 +145,28 @@ int MyApp::OnExit()
// main frame ctor // main frame ctor
MyFrame::MyFrame() MyFrame::MyFrame()
: wxFrame((wxFrame *) NULL, -1, "wxConfig Demo") : wxFrame((wxFrame *) NULL, -1, _T("wxConfig Demo"))
{ {
// menu // menu
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
file_menu->Append(ConfTest_Delete, "&Delete", "Delete config file"); file_menu->Append(ConfTest_Delete, _T("&Delete"), _T("Delete config file"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(ConfTest_About, "&About\tF1", "About this sample"); file_menu->Append(ConfTest_About, _T("&About\tF1"), _T("About this sample"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(ConfTest_Quit, "E&xit\tAlt-X", "Exit the program"); file_menu->Append(ConfTest_Quit, _T("E&xit\tAlt-X"), _T("Exit the program"));
wxMenuBar *menu_bar = new wxMenuBar; wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File"); menu_bar->Append(file_menu, _T("&File"));
SetMenuBar(menu_bar); SetMenuBar(menu_bar);
CreateStatusBar(); CreateStatusBar();
// child controls // child controls
wxPanel *panel = new wxPanel(this); wxPanel *panel = new wxPanel(this);
(void)new wxStaticText(panel, -1, "These controls remember their values!", (void)new wxStaticText(panel, -1, _T("These controls remember their values!"),
wxPoint(10, 10), wxSize(300, 20)); wxPoint(10, 10), wxSize(300, 20));
m_text = new wxTextCtrl(panel, -1, "", wxPoint(10, 40), wxSize(300, 20)); m_text = new wxTextCtrl(panel, -1, _T(""), wxPoint(10, 40), wxSize(300, 20));
m_check = new wxCheckBox(panel, -1, "show welcome message box at startup", m_check = new wxCheckBox(panel, -1, _T("show welcome message box at startup"),
wxPoint(10, 70), wxSize(300, 20)); wxPoint(10, 70), wxSize(300, 20));
// restore the control's values from the config // restore the control's values from the config
@@ -179,25 +179,25 @@ MyFrame::MyFrame()
wxConfigBase *pConfig = wxConfigBase::Get(); wxConfigBase *pConfig = wxConfigBase::Get();
// we could write Read("/Controls/Text") as well, it's just to show SetPath() // we could write Read("/Controls/Text") as well, it's just to show SetPath()
pConfig->SetPath("/Controls"); pConfig->SetPath(_T("/Controls"));
m_text->SetValue(pConfig->Read("Text", "")); m_text->SetValue(pConfig->Read(_T("Text"), _T("")));
m_check->SetValue(pConfig->Read("Check", 1l) != 0); m_check->SetValue(pConfig->Read(_T("Check"), 1l) != 0);
// SetPath() understands ".." // SetPath() understands ".."
pConfig->SetPath("../MainFrame"); pConfig->SetPath(_T("../MainFrame"));
// restore frame position and size // restore frame position and size
int x = pConfig->Read("x", 50), int x = pConfig->Read(_T("x"), 50),
y = pConfig->Read("y", 50), y = pConfig->Read(_T("y"), 50),
w = pConfig->Read("w", 350), w = pConfig->Read(_T("w"), 350),
h = pConfig->Read("h", 200); h = pConfig->Read(_T("h"), 200);
Move(x, y); Move(x, y);
SetClientSize(w, h); SetClientSize(w, h);
pConfig->SetPath("/"); pConfig->SetPath(_T("/"));
wxString s; wxString s;
if ( pConfig->Read("TestValue", &s) ) if ( pConfig->Read(_T("TestValue"), &s) )
{ {
wxLogStatus(this, wxT("TestValue from config is '%s'"), s.c_str()); wxLogStatus(this, wxT("TestValue from config is '%s'"), s.c_str());
} }
@@ -247,18 +247,18 @@ MyFrame::~MyFrame()
return; return;
// save the control's values to the config // save the control's values to the config
pConfig->Write("/Controls/Text", m_text->GetValue()); pConfig->Write(_T("/Controls/Text"), m_text->GetValue());
pConfig->Write("/Controls/Check", m_check->GetValue()); pConfig->Write(_T("/Controls/Check"), m_check->GetValue());
// save the frame position // save the frame position
int x, y, w, h; int x, y, w, h;
GetClientSize(&w, &h); GetClientSize(&w, &h);
GetPosition(&x, &y); GetPosition(&x, &y);
pConfig->Write("/MainFrame/x", (long) x); pConfig->Write(_T("/MainFrame/x"), (long) x);
pConfig->Write("/MainFrame/y", (long) y); pConfig->Write(_T("/MainFrame/y"), (long) y);
pConfig->Write("/MainFrame/w", (long) w); pConfig->Write(_T("/MainFrame/w"), (long) w);
pConfig->Write("/MainFrame/h", (long) h); pConfig->Write(_T("/MainFrame/h"), (long) h);
pConfig->Write("/TestValue", wxT("A test value")); pConfig->Write(_T("/TestValue"), wxT("A test value"));
} }

326
samples/controls/controls.cpp
View File

@@ -173,7 +173,7 @@ private:
class MyFrame: public wxFrame class MyFrame: public wxFrame
{ {
public: public:
MyFrame(const char *title, int x, int y); MyFrame(const wxChar *title, int x, int y);
void OnQuit(wxCommandEvent& event); void OnQuit(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event); void OnAbout(wxCommandEvent& event);
@@ -351,7 +351,7 @@ bool MyApp::OnInit()
} }
// Create the main frame window // Create the main frame window
MyFrame *frame = new MyFrame("Controls wxWindows App", x, y); MyFrame *frame = new MyFrame(_T("Controls wxWindows App"), x, y);
frame->Show(TRUE); frame->Show(TRUE);
return TRUE; return TRUE;
@@ -547,7 +547,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_notebook = NULL; m_notebook = NULL;
m_label = NULL; m_label = NULL;
m_text = new wxTextCtrl(this, -1, "This is the log window.\n", m_text = new wxTextCtrl(this, -1, _T("This is the log window.\n"),
wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE); wxPoint(0, 250), wxSize(100, 50), wxTE_MULTILINE);
m_text->SetBackgroundColour(wxT("wheat")); m_text->SetBackgroundColour(wxT("wheat"));
@@ -559,11 +559,11 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
wxString choices[] = wxString choices[] =
{ {
"This", _T("This"),
"is one of my", _T("is one of my"),
"really", _T("really"),
"wonderful", _T("wonderful"),
"examples." _T("examples.")
}; };
#ifdef USE_XPM #ifdef USE_XPM
@@ -591,9 +591,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
}; };
wxImageList *imagelist = new wxImageList(16, 16, FALSE, Image_Max); wxImageList *imagelist = new wxImageList(16, 16, FALSE, Image_Max);
static const char *s_iconNames[Image_Max] = static const wxChar *s_iconNames[Image_Max] =
{ {
"list", "choice", "combo", "text", "radio", "gauge" _T("list"), _T("choice"), _T("combo"), _T("text"), _T("radio"),
_T("gauge")
}; };
for ( size_t n = 0; n < Image_Max; n++ ) for ( size_t n = 0; n < Image_Max; n++ )
@@ -633,33 +634,33 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_listbox->SetCursor(*wxCROSS_CURSOR); m_listbox->SetCursor(*wxCROSS_CURSOR);
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
m_listbox->SetToolTip( "This is a list box" ); m_listbox->SetToolTip( _T("This is a list box") );
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); m_lbSelectNum = new wxButton( panel, ID_LISTBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) ); m_lbSelectThis = new wxButton( panel, ID_LISTBOX_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
(void)new wxButton( panel, ID_LISTBOX_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) ); (void)new wxButton( panel, ID_LISTBOX_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
(void)new MyButton( panel, ID_LISTBOX_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); (void)new MyButton( panel, ID_LISTBOX_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
(void)new wxButton( panel, ID_LISTBOX_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) ); (void)new wxButton( panel, ID_LISTBOX_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); wxButton *button = new MyButton( panel, ID_LISTBOX_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
button->SetDefault(); button->SetDefault();
button->SetForegroundColour(*wxBLUE); button->SetForegroundColour(*wxBLUE);
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
button->SetToolTip( "Press here to set italic font" ); button->SetToolTip( _T("Press here to set italic font") );
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, "&Disable", wxPoint(20,170) ); m_checkbox = new wxCheckBox( panel, ID_LISTBOX_ENABLE, _T("&Disable"), wxPoint(20,170) );
m_checkbox->SetValue(FALSE); m_checkbox->SetValue(FALSE);
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
m_checkbox->SetToolTip( "Click here to disable the listbox" ); m_checkbox->SetToolTip( _T("Click here to disable the listbox") );
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
(void)new wxCheckBox( panel, ID_CHANGE_COLOUR, "&Toggle colour", (void)new wxCheckBox( panel, ID_CHANGE_COLOUR, _T("&Toggle colour"),
wxPoint(110,170) ); wxPoint(110,170) );
panel->SetCursor(wxCursor(wxCURSOR_HAND)); panel->SetCursor(wxCursor(wxCURSOR_HAND));
m_notebook->AddPage(panel, "wxListBox", TRUE, Image_List); m_notebook->AddPage(panel, _T("wxListBox"), TRUE, Image_List);
#if wxUSE_CHOICE #if wxUSE_CHOICE
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
@@ -672,64 +673,64 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_choice->SetSelection(2); m_choice->SetSelection(2);
m_choice->SetBackgroundColour( wxT("red") ); m_choice->SetBackgroundColour( wxT("red") );
(void)new wxButton( panel, ID_CHOICE_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
(void)new wxButton( panel, ID_CHOICE_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
(void)new wxButton( panel, ID_CHOICE_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
(void)new wxButton( panel, ID_CHOICE_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
(void)new wxButton( panel, ID_CHOICE_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
(void)new wxButton( panel, ID_CHOICE_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); (void)new wxButton( panel, ID_CHOICE_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
(void)new wxCheckBox( panel, ID_CHOICE_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) ); (void)new wxCheckBox( panel, ID_CHOICE_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
m_notebook->AddPage(panel, "wxChoice", FALSE, Image_Choice); m_notebook->AddPage(panel, _T("wxChoice"), FALSE, Image_Choice);
#endif // wxUSE_CHOICE #endif // wxUSE_CHOICE
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
(void)new wxStaticBox( panel, -1, "&Box around combobox", (void)new wxStaticBox( panel, -1, _T("&Box around combobox"),
wxPoint(5, 5), wxSize(150, 100)); wxPoint(5, 5), wxSize(150, 100));
m_combo = new MyComboBox( panel, ID_COMBO, "This", m_combo = new MyComboBox( panel, ID_COMBO, _T("This"),
wxPoint(20,25), wxSize(120, -1), wxPoint(20,25), wxSize(120, -1),
5, choices, 5, choices,
/* wxCB_READONLY | */ wxPROCESS_ENTER); /* wxCB_READONLY | */ wxPROCESS_ENTER);
(void)new wxButton( panel, ID_COMBO_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
(void)new wxButton( panel, ID_COMBO_SEL_STR, "&Select 'This'", wxPoint(340,30), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_SEL_STR, _T("&Select 'This'"), wxPoint(340,30), wxSize(140,30) );
(void)new wxButton( panel, ID_COMBO_CLEAR, "&Clear", wxPoint(180,80), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_CLEAR, _T("&Clear"), wxPoint(180,80), wxSize(140,30) );
(void)new wxButton( panel, ID_COMBO_APPEND, "&Append 'Hi!'", wxPoint(340,80), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_APPEND, _T("&Append 'Hi!'"), wxPoint(340,80), wxSize(140,30) );
(void)new wxButton( panel, ID_COMBO_DELETE, "D&elete selected item", wxPoint(180,130), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_DELETE, _T("D&elete selected item"), wxPoint(180,130), wxSize(140,30) );
(void)new wxButton( panel, ID_COMBO_FONT, "Set &Italic font", wxPoint(340,130), wxSize(140,30) ); (void)new wxButton( panel, ID_COMBO_FONT, _T("Set &Italic font"), wxPoint(340,130), wxSize(140,30) );
(void)new wxCheckBox( panel, ID_COMBO_ENABLE, "&Disable", wxPoint(20,130), wxSize(140,30) ); (void)new wxCheckBox( panel, ID_COMBO_ENABLE, _T("&Disable"), wxPoint(20,130), wxSize(140,30) );
m_notebook->AddPage(panel, "wxComboBox", FALSE, Image_Combo); m_notebook->AddPage(panel, _T("wxComboBox"), FALSE, Image_Combo);
wxString choices2[] = wxString choices2[] =
{ {
"First", "Second", _T("First"), _T("Second"),
/* "Third", /* "Third",
"Fourth", "Fifth", "Sixth", "Fourth", "Fifth", "Sixth",
"Seventh", "Eighth", "Nineth", "Tenth" */ "Seventh", "Eighth", "Nineth", "Tenth" */
}; };
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
(void)new MyRadioBox( panel, ID_RADIOBOX, "&That", wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS ); (void)new MyRadioBox( panel, ID_RADIOBOX, _T("&That"), wxPoint(10,160), wxSize(-1,-1), WXSIZEOF(choices2), choices2, 1, wxRA_SPECIFY_ROWS );
m_radio = new wxRadioBox( panel, ID_RADIOBOX, "T&his", wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS ); m_radio = new wxRadioBox( panel, ID_RADIOBOX, _T("T&his"), wxPoint(10,10), wxSize(-1,-1), WXSIZEOF(choices), choices, 1, wxRA_SPECIFY_COLS );
m_radio->SetForegroundColour(*wxRED); m_radio->SetForegroundColour(*wxRED);
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
m_combo->SetToolTip("This is a natural\ncombobox - can you believe me?"); m_combo->SetToolTip(_T("This is a natural\ncombobox - can you believe me?"));
m_radio->SetToolTip("Ever seen a radiobox?"); m_radio->SetToolTip(_T("Ever seen a radiobox?"));
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
(void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, "Select #&2", wxPoint(180,30), wxSize(140,30) ); (void)new wxButton( panel, ID_RADIOBOX_SEL_NUM, _T("Select #&2"), wxPoint(180,30), wxSize(140,30) );
(void)new wxButton( panel, ID_RADIOBOX_SEL_STR, "&Select 'This'", wxPoint(180,80), wxSize(140,30) ); (void)new wxButton( panel, ID_RADIOBOX_SEL_STR, _T("&Select 'This'"), wxPoint(180,80), wxSize(140,30) );
m_fontButton = new wxButton( panel, ID_SET_FONT, "Set &more Italic font", wxPoint(340,30), wxSize(140,30) ); m_fontButton = new wxButton( panel, ID_SET_FONT, _T("Set &more Italic font"), wxPoint(340,30), wxSize(140,30) );
(void)new wxButton( panel, ID_RADIOBOX_FONT, "Set &Italic font", wxPoint(340,80), wxSize(140,30) ); (void)new wxButton( panel, ID_RADIOBOX_FONT, _T("Set &Italic font"), wxPoint(340,80), wxSize(140,30) );
(void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, "&Disable", wxPoint(340,130), wxDefaultSize ); (void)new wxCheckBox( panel, ID_RADIOBOX_ENABLE, _T("&Disable"), wxPoint(340,130), wxDefaultSize );
wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, "Radiobutton1", wxPoint(210,170), wxDefaultSize, wxRB_GROUP ); wxRadioButton *rb = new wxRadioButton( panel, ID_RADIOBUTTON_1, _T("Radiobutton1"), wxPoint(210,170), wxDefaultSize, wxRB_GROUP );
rb->SetValue( FALSE ); rb->SetValue( FALSE );
(void)new wxRadioButton( panel, ID_RADIOBUTTON_2, "&Radiobutton2", wxPoint(340,170), wxDefaultSize ); (void)new wxRadioButton( panel, ID_RADIOBUTTON_2, _T("&Radiobutton2"), wxPoint(340,170), wxDefaultSize );
m_notebook->AddPage(panel, "wxRadioBox", FALSE, Image_Radio); m_notebook->AddPage(panel, _T("wxRadioBox"), FALSE, Image_Radio);
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
(void)new wxStaticBox( panel, -1, "&wxGauge and wxSlider", wxPoint(10,10), wxSize(222,130) ); (void)new wxStaticBox( panel, -1, _T("&wxGauge and wxSlider"), wxPoint(10,10), wxSize(222,130) );
m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER ); m_gauge = new wxGauge( panel, -1, 200, wxPoint(18,50), wxSize(155, 30), wxGA_HORIZONTAL|wxNO_BORDER );
m_gauge->SetBackgroundColour(*wxGREEN); m_gauge->SetBackgroundColour(*wxGREEN);
m_gauge->SetForegroundColour(*wxRED); m_gauge->SetForegroundColour(*wxRED);
@@ -743,25 +744,25 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_slider->SetToolTip(_T("This is a sliding slider")); m_slider->SetToolTip(_T("This is a sliding slider"));
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
(void)new wxStaticBox( panel, -1, "&Explanation", (void)new wxStaticBox( panel, -1, _T("&Explanation"),
wxPoint(230,10), wxSize(270,130), wxPoint(230,10), wxSize(270,130),
wxALIGN_CENTER ); wxALIGN_CENTER );
#ifdef __WXMOTIF__ #ifdef __WXMOTIF__
// No wrapping text in wxStaticText yet :-( // No wrapping text in wxStaticText yet :-(
(void)new wxStaticText( panel, -1, (void)new wxStaticText( panel, -1,
"Drag the slider!", _T("Drag the slider!"),
wxPoint(250,30), wxPoint(250,30),
wxSize(240, -1) wxSize(240, -1)
); );
#else #else
(void)new wxStaticText( panel, -1, (void)new wxStaticText( panel, -1,
"In order see the gauge (aka progress bar)\n" _T("In order see the gauge (aka progress bar)\n")
"control do something you have to drag the\n" _T("control do something you have to drag the\n")
"handle of the slider to the right.\n" _T("handle of the slider to the right.\n")
"\n" _T("\n")
"This is also supposed to demonstrate how\n" _T("This is also supposed to demonstrate how\n")
"to use static controls.\n", _T("to use static controls.\n"),
wxPoint(250,25), wxPoint(250,25),
wxSize(240, 110) wxSize(240, 110)
); );
@@ -775,17 +776,17 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_spinbutton->SetRange(-40,30); m_spinbutton->SetRange(-40,30);
m_spinbutton->SetValue(initialSpinValue); m_spinbutton->SetValue(initialSpinValue);
m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, "&Show progress dialog", m_btnProgress = new wxButton( panel, ID_BTNPROGRESS, _T("&Show progress dialog"),
wxPoint(300, 160) ); wxPoint(300, 160) );
#endif // wxUSE_SPINBTN #endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, "", wxPoint(200, 160), wxSize(80, -1) ); m_spinctrl = new wxSpinCtrl( panel, ID_SPINCTRL, _T(""), wxPoint(200, 160), wxSize(80, -1) );
m_spinctrl->SetRange(10,30); m_spinctrl->SetRange(10,30);
m_spinctrl->SetValue(15); m_spinctrl->SetValue(15);
#endif // wxUSE_SPINCTRL #endif // wxUSE_SPINCTRL
m_notebook->AddPage(panel, "wxGauge", FALSE, Image_Gauge); m_notebook->AddPage(panel, _T("wxGauge"), FALSE, Image_Gauge);
panel = new wxPanel(m_notebook); panel = new wxPanel(m_notebook);
@@ -804,14 +805,14 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
dc.SetPen(*wxGREEN_PEN); dc.SetPen(*wxGREEN_PEN);
dc.Clear(); dc.Clear();
dc.DrawEllipse(5, 5, 90, 90); dc.DrawEllipse(5, 5, 90, 90);
dc.DrawText("Bitmap", 30, 40); dc.DrawText(_T("Bitmap"), 30, 40);
dc.SelectObject( wxNullBitmap ); dc.SelectObject( wxNullBitmap );
(void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20)); (void)new wxBitmapButton(panel, ID_BITMAP_BTN, bitmap, wxPoint(100, 20));
#ifdef __WXMSW__ #ifdef __WXMSW__
// test for masked bitmap display // test for masked bitmap display
bitmap = wxBitmap("test2.bmp", wxBITMAP_TYPE_BMP); bitmap = wxBitmap(_T("test2.bmp"), wxBITMAP_TYPE_BMP);
if (bitmap.Ok()) if (bitmap.Ok())
{ {
bitmap.SetMask(new wxMask(bitmap, *wxBLUE)); bitmap.SetMask(new wxMask(bitmap, *wxBLUE));
@@ -835,15 +836,15 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
#if wxUSE_TOGGLEBTN #if wxUSE_TOGGLEBTN
(void)new wxToggleButton(panel, ID_BUTTON_LABEL, (void)new wxToggleButton(panel, ID_BUTTON_LABEL,
"&Toggle label", wxPoint(250, 20)); _T("&Toggle label"), wxPoint(250, 20));
#endif // wxUSE_TOGGLEBTN #endif // wxUSE_TOGGLEBTN
m_label = new wxStaticText(panel, -1, "Label with some long text", m_label = new wxStaticText(panel, -1, _T("Label with some long text"),
wxPoint(250, 60), wxDefaultSize, wxPoint(250, 60), wxDefaultSize,
wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/); wxALIGN_RIGHT /*| wxST_NO_AUTORESIZE*/);
m_label->SetForegroundColour( *wxBLUE ); m_label->SetForegroundColour( *wxBLUE );
m_notebook->AddPage(panel, "wxBitmapXXX"); m_notebook->AddPage(panel, _T("wxBitmapXXX"));
// layout constraints // layout constraints
#if wxUSE_CONSTRAINTS #if wxUSE_CONSTRAINTS
@@ -858,7 +859,7 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
c->left.SameAs( panel, wxLeft, 10 ); c->left.SameAs( panel, wxLeft, 10 );
c->width.PercentOf( panel, wxWidth, 40 ); c->width.PercentOf( panel, wxWidth, 40 );
wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, "Test Button &1" ); wxButton *pMyButton = new wxButton(panel, ID_BUTTON_TEST1, _T("Test Button &1") );
pMyButton->SetConstraints( c ); pMyButton->SetConstraints( c );
c = new wxLayoutConstraints; c = new wxLayoutConstraints;
@@ -867,10 +868,10 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
c->right.SameAs( panel, wxRight, 10 ); c->right.SameAs( panel, wxRight, 10 );
c->width.PercentOf( panel, wxWidth, 40 ); c->width.PercentOf( panel, wxWidth, 40 );
wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, "Test Button &2" ); wxButton *pMyButton2 = new wxButton(panel, ID_BUTTON_TEST2, _T("Test Button &2") );
pMyButton2->SetConstraints( c ); pMyButton2->SetConstraints( c );
m_notebook->AddPage(panel, "wxLayoutConstraint"); m_notebook->AddPage(panel, _T("wxLayoutConstraint"));
#endif #endif
// sizer // sizer
@@ -881,26 +882,26 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer *sizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer *csizer = wxStaticBoxSizer *csizer =
new wxStaticBoxSizer (new wxStaticBox (panel, -1, "Show Buttons"), new wxStaticBoxSizer (new wxStaticBox (panel, -1, _T("Show Buttons")),
wxHORIZONTAL ); wxHORIZONTAL );
wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig; wxCheckBox *check1, *check2, *check3, *check4, *check14, *checkBig;
check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, "1"); check1 = new wxCheckBox (panel, ID_SIZER_CHECK1, _T("1"));
check1->SetValue (TRUE); check1->SetValue (TRUE);
csizer->Add (check1); csizer->Add (check1);
check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, "2"); check2 = new wxCheckBox (panel, ID_SIZER_CHECK2, _T("2"));
check2->SetValue (TRUE); check2->SetValue (TRUE);
csizer->Add (check2); csizer->Add (check2);
check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, "3"); check3 = new wxCheckBox (panel, ID_SIZER_CHECK3, _T("3"));
check3->SetValue (TRUE); check3->SetValue (TRUE);
csizer->Add (check3); csizer->Add (check3);
check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, "4"); check4 = new wxCheckBox (panel, ID_SIZER_CHECK4, _T("4"));
check4->SetValue (TRUE); check4->SetValue (TRUE);
csizer->Add (check4); csizer->Add (check4);
check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, "1-4"); check14 = new wxCheckBox (panel, ID_SIZER_CHECK14, _T("1-4"));
check14->SetValue (TRUE); check14->SetValue (TRUE);
csizer->Add (check14); csizer->Add (check14);
checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, "Big"); checkBig = new wxCheckBox (panel, ID_SIZER_CHECKBIG, _T("Big"));
checkBig->SetValue (TRUE); checkBig->SetValue (TRUE);
csizer->Add (checkBig); csizer->Add (checkBig);
@@ -910,25 +911,25 @@ MyPanel::MyPanel( wxFrame *frame, int x, int y, int w, int h )
m_buttonSizer = new wxBoxSizer (wxVERTICAL); m_buttonSizer = new wxBoxSizer (wxVERTICAL);
m_sizerBtn1 = new wxButton(panel, -1, "Test Button &1" ); m_sizerBtn1 = new wxButton(panel, -1, _T("Test Button &1") );
m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 ); m_buttonSizer->Add( m_sizerBtn1, 0, wxALL, 10 );
m_sizerBtn2 = new wxButton(panel, -1, "Test Button &2" ); m_sizerBtn2 = new wxButton(panel, -1, _T("Test Button &2") );
m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 ); m_buttonSizer->Add( m_sizerBtn2, 0, wxALL, 10 );
m_sizerBtn3 = new wxButton(panel, -1, "Test Button &3" ); m_sizerBtn3 = new wxButton(panel, -1, _T("Test Button &3") );
m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 ); m_buttonSizer->Add( m_sizerBtn3, 0, wxALL, 10 );
m_sizerBtn4 = new wxButton(panel, -1, "Test Button &4" ); m_sizerBtn4 = new wxButton(panel, -1, _T("Test Button &4") );
m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 ); m_buttonSizer->Add( m_sizerBtn4, 0, wxALL, 10 );
m_hsizer->Add (m_buttonSizer); m_hsizer->Add (m_buttonSizer);
m_hsizer->Add( 20,20, 1 ); m_hsizer->Add( 20,20, 1 );
m_bigBtn = new wxButton(panel, -1, "Multiline\nbutton" ); m_bigBtn = new wxButton(panel, -1, _T("Multiline\nbutton") );
m_hsizer->Add( m_bigBtn , 3, wxGROW|wxALL, 10 ); m_hsizer->Add( m_bigBtn , 3, wxGROW|wxALL, 10 );
sizer->Add (m_hsizer, 1, wxGROW); sizer->Add (m_hsizer, 1, wxGROW);
panel->SetSizer( sizer ); panel->SetSizer( sizer );
m_notebook->AddPage(panel, "wxSizer"); m_notebook->AddPage(panel, _T("wxSizer"));
} }
void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) ) void MyPanel::OnSize( wxSizeEvent& WXUNUSED(event) )
@@ -946,10 +947,10 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
int selOld = event.GetOldSelection(); int selOld = event.GetOldSelection();
if ( selOld == 2 ) if ( selOld == 2 )
{ {
if ( wxMessageBox("This demonstrates how a program may prevent the\n" if ( wxMessageBox(_T("This demonstrates how a program may prevent the\n")
"page change from taking place - if you select\n" _T("page change from taking place - if you select\n")
"[No] the current page will stay the third one\n", _T("[No] the current page will stay the third one\n"),
"Control sample", _T("Control sample"),
wxICON_QUESTION | wxYES_NO, this) != wxYES ) wxICON_QUESTION | wxYES_NO, this) != wxYES )
{ {
event.Veto(); event.Veto();
@@ -958,16 +959,17 @@ void MyPanel::OnPageChanging( wxNotebookEvent &event )
} }
} }
*m_text << "Notebook selection is being changed from " << selOld *m_text << _T("Notebook selection is being changed from ") << selOld
<< " to " << event.GetSelection() << _T(" to ") << event.GetSelection()
<< " (current page from notebook is " << _T(" (current page from notebook is ")
<< m_notebook->GetSelection() << ")\n"; << m_notebook->GetSelection() << _T(")\n");
} }
void MyPanel::OnPageChanged( wxNotebookEvent &event ) void MyPanel::OnPageChanged( wxNotebookEvent &event )
{ {
*m_text << "Notebook selection is now " << event.GetSelection() *m_text << _T("Notebook selection is now ") << event.GetSelection()
<< " (from notebook: " << m_notebook->GetSelection() << ")\n"; << _T(" (from notebook: ") << m_notebook->GetSelection()
<< _T(")\n");
} }
void MyPanel::OnTestButton(wxCommandEvent& event) void MyPanel::OnTestButton(wxCommandEvent& event)
@@ -1013,42 +1015,42 @@ void MyPanel::OnListBox( wxCommandEvent &event )
if (event.GetInt() == -1) if (event.GetInt() == -1)
{ {
m_text->AppendText( "ListBox has no selections anymore\n" ); m_text->AppendText( _T("ListBox has no selections anymore\n") );
return; return;
} }
wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox wxListBox *listbox = event.GetId() == ID_LISTBOX ? m_listbox
: m_listboxSorted; : m_listboxSorted;
m_text->AppendText( "ListBox event selection string is: '" ); m_text->AppendText( _T("ListBox event selection string is: '") );
m_text->AppendText( event.GetString() ); m_text->AppendText( event.GetString() );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
m_text->AppendText( "ListBox control selection string is: '" ); m_text->AppendText( _T("ListBox control selection string is: '") );
m_text->AppendText( listbox->GetStringSelection() ); m_text->AppendText( listbox->GetStringSelection() );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject()); wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
m_text->AppendText( "ListBox event client data string is: '" ); m_text->AppendText( _T("ListBox event client data string is: '") );
if (obj) // BC++ doesn't like use of '? .. : .. ' in this context if (obj) // BC++ doesn't like use of '? .. : .. ' in this context
m_text->AppendText( obj->GetData() ); m_text->AppendText( obj->GetData() );
else else
m_text->AppendText( wxString("none") ); m_text->AppendText( wxString(_T("none")) );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
m_text->AppendText( "ListBox control client data string is: '" ); m_text->AppendText( _T("ListBox control client data string is: '") );
obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection()); obj = (wxStringClientData *)listbox->GetClientObject(listbox->GetSelection());
if (obj) if (obj)
m_text->AppendText( obj->GetData() ); m_text->AppendText( obj->GetData() );
else else
m_text->AppendText( wxString("none") ); m_text->AppendText( wxString(_T("none")) );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
} }
void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event ) void MyPanel::OnListBoxDoubleClick( wxCommandEvent &event )
{ {
m_text->AppendText( "ListBox double click string is: " ); m_text->AppendText( _T("ListBox double click string is: ") );
m_text->AppendText( event.GetString() ); m_text->AppendText( event.GetString() );
m_text->AppendText( "\n" ); m_text->AppendText( _T("\n") );
} }
void MyPanel::OnListBoxButtons( wxCommandEvent &event ) void MyPanel::OnListBoxButtons( wxCommandEvent &event )
@@ -1057,13 +1059,13 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
{ {
case ID_LISTBOX_ENABLE: case ID_LISTBOX_ENABLE:
{ {
m_text->AppendText("Checkbox clicked.\n"); m_text->AppendText(_T("Checkbox clicked.\n"));
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
wxCheckBox *cb = (wxCheckBox*)event.GetEventObject(); wxCheckBox *cb = (wxCheckBox*)event.GetEventObject();
if (event.GetInt()) if (event.GetInt())
cb->SetToolTip( "Click to enable listbox" ); cb->SetToolTip( _T("Click to enable listbox") );
else else
cb->SetToolTip( "Click to disable listbox" ); cb->SetToolTip( _T("Click to disable listbox") );
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
m_listbox->Enable( event.GetInt() == 0 ); m_listbox->Enable( event.GetInt() == 0 );
m_lbSelectThis->Enable( event.GetInt() == 0 ); m_lbSelectThis->Enable( event.GetInt() == 0 );
@@ -1081,8 +1083,8 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
} }
case ID_LISTBOX_SEL_STR: case ID_LISTBOX_SEL_STR:
{ {
m_listbox->SetStringSelection( "This" ); m_listbox->SetStringSelection( _T("This") );
m_listboxSorted->SetStringSelection( "This" ); m_listboxSorted->SetStringSelection( _T("This") );
m_lbSelectNum->WarpPointer( 40, 14 ); m_lbSelectNum->WarpPointer( 40, 14 );
break; break;
} }
@@ -1094,8 +1096,8 @@ void MyPanel::OnListBoxButtons( wxCommandEvent &event )
} }
case ID_LISTBOX_APPEND: case ID_LISTBOX_APPEND:
{ {
m_listbox->Append( "Hi!" ); m_listbox->Append( _T("Hi!") );
m_listboxSorted->Append( "Hi!" ); m_listboxSorted->Append( _T("Hi!") );
break; break;
} }
case ID_LISTBOX_DELETE: case ID_LISTBOX_DELETE:
@@ -1125,30 +1127,30 @@ void MyPanel::OnChoice( wxCommandEvent &event )
wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice wxChoice *choice = event.GetId() == ID_CHOICE ? m_choice
: m_choiceSorted; : m_choiceSorted;
m_text->AppendText( "Choice event selection string is: '" ); m_text->AppendText( _T("Choice event selection string is: '") );
m_text->AppendText( event.GetString() ); m_text->AppendText( event.GetString() );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
m_text->AppendText( "Choice control selection string is: '" ); m_text->AppendText( _T("Choice control selection string is: '") );
m_text->AppendText( choice->GetStringSelection() ); m_text->AppendText( choice->GetStringSelection() );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject()); wxStringClientData *obj = ((wxStringClientData *)event.GetClientObject());
m_text->AppendText( "Choice event client data string is: '" ); m_text->AppendText( _T("Choice event client data string is: '") );
if (obj) if (obj)
m_text->AppendText( obj->GetData() ); m_text->AppendText( obj->GetData() );
else else
m_text->AppendText( wxString("none") ); m_text->AppendText( wxString(_T("none")) );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
m_text->AppendText( "Choice control client data string is: '" ); m_text->AppendText( _T("Choice control client data string is: '") );
obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection()); obj = (wxStringClientData *)choice->GetClientObject(choice->GetSelection());
if (obj) if (obj)
m_text->AppendText( obj->GetData() ); m_text->AppendText( obj->GetData() );
else else
m_text->AppendText( wxString("none") ); m_text->AppendText( wxString(_T("none")) );
m_text->AppendText( "'\n" ); m_text->AppendText( _T("'\n") );
} }
void MyPanel::OnChoiceButtons( wxCommandEvent &event ) void MyPanel::OnChoiceButtons( wxCommandEvent &event )
@@ -1169,8 +1171,8 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
} }
case ID_CHOICE_SEL_STR: case ID_CHOICE_SEL_STR:
{ {
m_choice->SetStringSelection( "This" ); m_choice->SetStringSelection( _T("This") );
m_choiceSorted->SetStringSelection( "This" ); m_choiceSorted->SetStringSelection( _T("This") );
break; break;
} }
case ID_CHOICE_CLEAR: case ID_CHOICE_CLEAR:
@@ -1181,8 +1183,8 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
} }
case ID_CHOICE_APPEND: case ID_CHOICE_APPEND:
{ {
m_choice->Append( "Hi!" ); m_choice->Append( _T("Hi!") );
m_choiceSorted->Append( "Hi!" ); m_choiceSorted->Append( _T("Hi!") );
break; break;
} }
case ID_CHOICE_DELETE: case ID_CHOICE_DELETE:
@@ -1207,12 +1209,12 @@ void MyPanel::OnChoiceButtons( wxCommandEvent &event )
void MyPanel::OnCombo( wxCommandEvent &event ) void MyPanel::OnCombo( wxCommandEvent &event )
{ {
m_text->AppendText( "ComboBox event selection string is: " ); m_text->AppendText( _T("ComboBox event selection string is: ") );
m_text->AppendText( event.GetString() ); m_text->AppendText( event.GetString() );
m_text->AppendText( "\n" ); m_text->AppendText( _T("\n") );
m_text->AppendText( "ComboBox control selection string is: " ); m_text->AppendText( _T("ComboBox control selection string is: ") );
m_text->AppendText( m_combo->GetStringSelection() ); m_text->AppendText( m_combo->GetStringSelection() );
m_text->AppendText( "\n" ); m_text->AppendText( _T("\n") );
} }
void MyPanel::OnComboTextChanged(wxCommandEvent& event) void MyPanel::OnComboTextChanged(wxCommandEvent& event)
@@ -1245,7 +1247,7 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
} }
case ID_COMBO_SEL_STR: case ID_COMBO_SEL_STR:
{ {
m_combo->SetStringSelection( "This" ); m_combo->SetStringSelection( _T("This") );
break; break;
} }
case ID_COMBO_CLEAR: case ID_COMBO_CLEAR:
@@ -1255,7 +1257,7 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
} }
case ID_COMBO_APPEND: case ID_COMBO_APPEND:
{ {
m_combo->Append( "Hi!" ); m_combo->Append( _T("Hi!") );
break; break;
} }
case ID_COMBO_DELETE: case ID_COMBO_DELETE:
@@ -1274,9 +1276,9 @@ void MyPanel::OnComboButtons( wxCommandEvent &event )
void MyPanel::OnRadio( wxCommandEvent &event ) void MyPanel::OnRadio( wxCommandEvent &event )
{ {
m_text->AppendText( "RadioBox selection string is: " ); m_text->AppendText( _T("RadioBox selection string is: ") );
m_text->AppendText( event.GetString() ); m_text->AppendText( event.GetString() );
m_text->AppendText( "\n" ); m_text->AppendText( _T("\n") );
} }
void MyPanel::OnRadioButtons( wxCommandEvent &event ) void MyPanel::OnRadioButtons( wxCommandEvent &event )
@@ -1295,7 +1297,7 @@ void MyPanel::OnRadioButtons( wxCommandEvent &event )
} }
case ID_RADIOBOX_SEL_STR: case ID_RADIOBOX_SEL_STR:
{ {
m_radio->SetStringSelection( "This" ); m_radio->SetStringSelection( _T("This") );
break; break;
} }
case ID_RADIOBOX_FONT: case ID_RADIOBOX_FONT:
@@ -1316,8 +1318,8 @@ void MyPanel::OnSetFont( wxCommandEvent &WXUNUSED(event) )
void MyPanel::OnUpdateLabel( wxCommandEvent &event ) void MyPanel::OnUpdateLabel( wxCommandEvent &event )
{ {
m_label->SetLabel(event.GetInt() ? "Very very very very very long text." m_label->SetLabel(event.GetInt() ? _T("Very very very very very long text.")
: "Shorter text."); : _T("Shorter text."));
} }
void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) ) void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
@@ -1433,8 +1435,8 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
return; return;
} }
wxProgressDialog dialog("Progress dialog example", wxProgressDialog dialog(_T("Progress dialog example"),
"An informative message", _T("An informative message"),
max, // range max, // range
this, // parent this, // parent
wxPD_CAN_ABORT | wxPD_CAN_ABORT |
@@ -1451,11 +1453,11 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
wxSleep(1); wxSleep(1);
if ( i == max ) if ( i == max )
{ {
cont = dialog.Update(i, "That's all, folks!"); cont = dialog.Update(i, _T("That's all, folks!"));
} }
else if ( i == max / 2 ) else if ( i == max / 2 )
{ {
cont = dialog.Update(i, "Only a half left (very long message)!"); cont = dialog.Update(i, _T("Only a half left (very long message)!"));
} }
else else
{ {
@@ -1465,11 +1467,11 @@ void MyPanel::OnShowProgress( wxCommandEvent& WXUNUSED(event) )
if ( !cont ) if ( !cont )
{ {
*m_text << "Progress dialog aborted!\n"; *m_text << _T("Progress dialog aborted!\n");
} }
else else
{ {
*m_text << "Countdown from " << max << " finished.\n"; *m_text << _T("Countdown from ") << max << _T(" finished.\n");
} }
} }
@@ -1535,7 +1537,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_IDLE(MyFrame::OnIdle) EVT_IDLE(MyFrame::OnIdle)
END_EVENT_TABLE() END_EVENT_TABLE()
MyFrame::MyFrame(const char *title, int x, int y) MyFrame::MyFrame(const wxChar *title, int x, int y)
: wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(500, 430)) : wxFrame(NULL, -1, title, wxPoint(x, y), wxSize(500, 430))
{ {
// Give it an icon // Give it an icon
@@ -1546,29 +1548,29 @@ MyFrame::MyFrame(const char *title, int x, int y)
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
file_menu->Append(CONTROLS_CLEAR_LOG, "&Clear log\tCtrl-L"); file_menu->Append(CONTROLS_CLEAR_LOG, _T("&Clear log\tCtrl-L"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(CONTROLS_ABOUT, "&About\tF1"); file_menu->Append(CONTROLS_ABOUT, _T("&About\tF1"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(CONTROLS_QUIT, "E&xit\tAlt-X", "Quit controls sample"); file_menu->Append(CONTROLS_QUIT, _T("E&xit\tAlt-X"), _T("Quit controls sample"));
wxMenuBar *menu_bar = new wxMenuBar; wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File"); menu_bar->Append(file_menu, _T("&File"));
#if wxUSE_TOOLTIPS #if wxUSE_TOOLTIPS
wxMenu *tooltip_menu = new wxMenu; wxMenu *tooltip_menu = new wxMenu;
tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, "Set &delay\tCtrl-D"); tooltip_menu->Append(CONTROLS_SET_TOOLTIP_DELAY, _T("Set &delay\tCtrl-D"));
tooltip_menu->AppendSeparator(); tooltip_menu->AppendSeparator();
tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, "&Toggle tooltips\tCtrl-T", tooltip_menu->Append(CONTROLS_ENABLE_TOOLTIPS, _T("&Toggle tooltips\tCtrl-T"),
"enable/disable tooltips", TRUE); _T("enable/disable tooltips"), TRUE);
tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE); tooltip_menu->Check(CONTROLS_ENABLE_TOOLTIPS, TRUE);
menu_bar->Append(tooltip_menu, "&Tooltips"); menu_bar->Append(tooltip_menu, _T("&Tooltips"));
#endif // wxUSE_TOOLTIPS #endif // wxUSE_TOOLTIPS
wxMenu *panel_menu = new wxMenu; wxMenu *panel_menu = new wxMenu;
panel_menu->Append(CONTROLS_ENABLE_ALL, "&Disable all\tCtrl-E", panel_menu->Append(CONTROLS_ENABLE_ALL, _T("&Disable all\tCtrl-E"),
"Enable/disable all panel controls", TRUE); _T("Enable/disable all panel controls"), TRUE);
menu_bar->Append(panel_menu, "&Panel"); menu_bar->Append(panel_menu, _T("&Panel"));
SetMenuBar(menu_bar); SetMenuBar(menu_bar);
@@ -1588,7 +1590,7 @@ void MyFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
{ {
wxBusyCursor bc; wxBusyCursor bc;
wxMessageDialog dialog(this, "This is a control sample", "About Controls", wxOK ); wxMessageDialog dialog(this, _T("This is a control sample"), _T("About Controls"), wxOK );
dialog.ShowModal(); dialog.ShowModal();
} }
@@ -1605,8 +1607,8 @@ void MyFrame::OnSetTooltipDelay(wxCommandEvent& event)
wxString delay; wxString delay;
delay.Printf( _T("%ld"), s_delay); delay.Printf( _T("%ld"), s_delay);
delay = wxGetTextFromUser("Enter delay (in milliseconds)", delay = wxGetTextFromUser(_T("Enter delay (in milliseconds)"),
"Set tooltip delay", _T("Set tooltip delay"),
delay, delay,
this); this);
if ( !delay ) if ( !delay )

18
samples/dialogs/dialogs.cpp
View File

@@ -122,7 +122,7 @@ bool MyApp::OnInit()
wxConvCurrent = &wxConvLibc; wxConvCurrent = &wxConvLibc;
#endif #endif
m_canvasTextColour = wxColour("BLACK"); m_canvasTextColour = wxColour(_T("BLACK"));
m_canvasFont = *wxNORMAL_FONT; m_canvasFont = *wxNORMAL_FONT;
// Create the main frame window // Create the main frame window
@@ -170,12 +170,12 @@ bool MyApp::OnInit()
file_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B")); file_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B"));
#endif // wxUSE_BUSYINFO #endif // wxUSE_BUSYINFO
#if wxUSE_FINDREPLDLG #if wxUSE_FINDREPLDLG
file_menu->Append(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"), "", TRUE); file_menu->Append(DIALOGS_FIND, _T("&Find dialog\tCtrl-F"), _T(""), TRUE);
file_menu->Append(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"), "", TRUE); file_menu->Append(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F"), _T(""), TRUE);
#endif // wxUSE_FINDREPLDLG #endif // wxUSE_FINDREPLDLG
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W")); file_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W"));
file_menu->Append(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"), "", TRUE); file_menu->Append(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z"), _T(""), TRUE);
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X")); file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X"));
wxMenuBar *menu_bar = new wxMenuBar; wxMenuBar *menu_bar = new wxMenuBar;
@@ -226,7 +226,7 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) )
} }
wxColourDialog dialog(this, &data); wxColourDialog dialog(this, &data);
dialog.SetTitle("Choose the background colour"); dialog.SetTitle(_T("Choose the background colour"));
if (dialog.ShowModal() == wxID_OK) if (dialog.ShowModal() == wxID_OK)
{ {
wxColourData retData = dialog.GetColourData(); wxColourData retData = dialog.GetColourData();
@@ -375,7 +375,7 @@ void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event))
{ {
wxString pwd = wxGetPasswordFromUser(_T("Enter password:"), wxString pwd = wxGetPasswordFromUser(_T("Enter password:"),
_T("Password entry dialog"), _T("Password entry dialog"),
"", _T(""),
this); this);
if ( !!pwd ) if ( !!pwd )
{ {
@@ -707,7 +707,7 @@ void MyFrame::ShowBusyInfo(wxCommandEvent& WXUNUSED(event))
{ {
wxWindowDisabler disableAll; wxWindowDisabler disableAll;
wxBusyInfo info("Working, please wait...", this); wxBusyInfo info(_T("Working, please wait..."), this);
for ( int i = 0; i < 18; i++ ) for ( int i = 0; i < 18; i++ )
{ {
@@ -850,7 +850,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
dc.SetFont(wxGetApp().m_canvasFont); dc.SetFont(wxGetApp().m_canvasFont);
dc.SetTextForeground(wxGetApp().m_canvasTextColour); dc.SetTextForeground(wxGetApp().m_canvasTextColour);
dc.SetBackgroundMode(wxTRANSPARENT); dc.SetBackgroundMode(wxTRANSPARENT);
dc.DrawText("wxWindows common dialogs test application", 10, 10); dc.DrawText(_T("wxWindows common dialogs test application"), 10, 10);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -858,7 +858,7 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event) )
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
MyModelessDialog::MyModelessDialog(wxWindow *parent) MyModelessDialog::MyModelessDialog(wxWindow *parent)
: wxDialog(parent, -1, wxString("Modeless dialog")) : wxDialog(parent, -1, wxString(_T("Modeless dialog")))
{ {
wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);

22
samples/dialup/nettest.cpp
View File

@@ -156,7 +156,7 @@ IMPLEMENT_APP(MyApp)
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
// Create the main application window // Create the main application window
MyFrame *frame = new MyFrame("Dial-up wxWindows demo", MyFrame *frame = new MyFrame(_T("Dial-up wxWindows demo"),
wxPoint(50, 50), wxSize(450, 340)); wxPoint(50, 50), wxSize(450, 340));
// Show it and tell the application that it's our main window // Show it and tell the application that it's our main window
@@ -178,7 +178,7 @@ bool MyApp::OnInit()
return FALSE; return FALSE;
} }
frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? "LAN" : "No LAN", 2); frame->SetStatusText(GetDialer()->IsAlwaysOnline() ? _T("LAN") : _T("No LAN"), 2);
return TRUE; return TRUE;
} }
@@ -221,19 +221,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
// create a menu bar // create a menu bar
wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu;
menuFile->Append(NetTest_Dial, "&Dial\tCtrl-D", "Dial default ISP"); menuFile->Append(NetTest_Dial, _T("&Dial\tCtrl-D"), _T("Dial default ISP"));
menuFile->Append(NetTest_HangUp, "&HangUp\tCtrl-H", "Hang up modem"); menuFile->Append(NetTest_HangUp, _T("&HangUp\tCtrl-H"), _T("Hang up modem"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(NetTest_EnumISP, "&Enumerate ISPs...\tCtrl-E"); menuFile->Append(NetTest_EnumISP, _T("&Enumerate ISPs...\tCtrl-E"));
menuFile->Append(NetTest_Check, "&Check connection status...\tCtrl-C"); menuFile->Append(NetTest_Check, _T("&Check connection status...\tCtrl-C"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(NetTest_About, "&About...\tCtrl-A", "Show about dialog"); menuFile->Append(NetTest_About, _T("&About...\tCtrl-A"), _T("Show about dialog"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(NetTest_Quit, "E&xit\tAlt-X", "Quit this program"); menuFile->Append(NetTest_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
// now append the freshly created menu to the menu bar... // now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar; wxMenuBar *menuBar = new wxMenuBar;
menuBar->Append(menuFile, "&File"); menuBar->Append(menuFile, _T("&File"));
// ... and attach this menu bar to the frame // ... and attach this menu bar to the frame
SetMenuBar(menuBar); SetMenuBar(menuBar);
@@ -310,7 +310,7 @@ void MyFrame::OnEnumISPs(wxCommandEvent& WXUNUSED(event))
} }
else else
{ {
wxString msg = "Known ISPs:\n"; wxString msg = _T("Known ISPs:\n");
for ( size_t n = 0; n < nCount; n++ ) for ( size_t n = 0; n < nCount; n++ )
{ {
msg << names[n] << '\n'; msg << names[n] << '\n';
@@ -335,6 +335,6 @@ void MyFrame::OnIdle(wxIdleEvent& WXUNUSED(event))
{ {
s_isOnline = isOnline; s_isOnline = isOnline;
SetStatusText(isOnline ? "Online" : "Offline", 1); SetStatusText(isOnline ? _T("Online") : _T("Offline"), 1);
} }
} }

204
samples/dnd/dnd.cpp
View File

@@ -220,7 +220,7 @@ private:
class DnDFrame : public wxFrame class DnDFrame : public wxFrame
{ {
public: public:
DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h); DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h);
virtual ~DnDFrame(); virtual ~DnDFrame();
void OnPaint(wxPaintEvent& event); void OnPaint(wxPaintEvent& event);
@@ -748,9 +748,9 @@ public:
// override base class (pure) virtuals // override base class (pure) virtuals
virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def) virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
{ m_frame->SetStatusText("Mouse entered the frame"); return OnDragOver(x, y, def); } { m_frame->SetStatusText(_T("Mouse entered the frame")); return OnDragOver(x, y, def); }
virtual void OnLeave() virtual void OnLeave()
{ m_frame->SetStatusText("Mouse left the frame"); } { m_frame->SetStatusText(_T("Mouse left the frame")); }
virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def) virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
{ {
if ( !GetData() ) if ( !GetData() )
@@ -877,13 +877,13 @@ bool DnDApp::OnInit()
#if USE_RESOURCES #if USE_RESOURCES
// load our ressources // load our ressources
wxPathList pathList; wxPathList pathList;
pathList.Add("."); pathList.Add(_T("."));
#ifdef __WXMSW__ #ifdef __WXMSW__
pathList.Add("./Debug"); pathList.Add(_T("./Debug"));
pathList.Add("./Release"); pathList.Add(_T("./Release"));
#endif // wxMSW #endif // wxMSW
wxString path = pathList.FindValidPath("dnd.wxr"); wxString path = pathList.FindValidPath(_T("dnd.wxr"));
if ( !path ) if ( !path )
{ {
wxLogError(wxT("Can't find the resource file dnd.wxr in the current ") wxLogError(wxT("Can't find the resource file dnd.wxr in the current ")
@@ -912,7 +912,7 @@ bool DnDApp::OnInit()
// create the main frame window // create the main frame window
DnDFrame *frame = new DnDFrame((wxFrame *) NULL, DnDFrame *frame = new DnDFrame((wxFrame *) NULL,
"Drag-and-Drop/Clipboard wxWindows Sample", _T("Drag-and-Drop/Clipboard wxWindows Sample"),
10, 100, 650, 340); 10, 100, 650, 340);
// activate it // activate it
@@ -923,9 +923,9 @@ bool DnDApp::OnInit()
return TRUE; return TRUE;
} }
DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h) DnDFrame::DnDFrame(wxFrame *frame, wxChar *title, int x, int y, int w, int h)
: wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)), : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h)),
m_strText("wxWindows drag & drop works :-)") m_strText(_T("wxWindows drag & drop works :-)"))
{ {
// frame icon and status bar // frame icon and status bar
@@ -935,40 +935,40 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
// construct menu // construct menu
wxMenu *file_menu = new wxMenu; wxMenu *file_menu = new wxMenu;
file_menu->Append(Menu_Drag, "&Test drag..."); file_menu->Append(Menu_Drag, _T("&Test drag..."));
file_menu->AppendCheckItem(Menu_DragMoveDef, "&Move by default"); file_menu->AppendCheckItem(Menu_DragMoveDef, _T("&Move by default"));
file_menu->AppendCheckItem(Menu_DragMoveAllow, "&Allow moving"); file_menu->AppendCheckItem(Menu_DragMoveAllow, _T("&Allow moving"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(Menu_NewFrame, "&New frame\tCtrl-N"); file_menu->Append(Menu_NewFrame, _T("&New frame\tCtrl-N"));
file_menu->AppendSeparator(); file_menu->AppendSeparator();
file_menu->Append(Menu_Quit, "E&xit\tCtrl-Q"); file_menu->Append(Menu_Quit, _T("E&xit\tCtrl-Q"));
wxMenu *log_menu = new wxMenu; wxMenu *log_menu = new wxMenu;
log_menu->Append(Menu_Clear, "Clear\tCtrl-L"); log_menu->Append(Menu_Clear, _T("Clear\tCtrl-L"));
wxMenu *help_menu = new wxMenu; wxMenu *help_menu = new wxMenu;
help_menu->Append(Menu_Help, "&Help..."); help_menu->Append(Menu_Help, _T("&Help..."));
help_menu->AppendSeparator(); help_menu->AppendSeparator();
help_menu->Append(Menu_About, "&About"); help_menu->Append(Menu_About, _T("&About"));
wxMenu *clip_menu = new wxMenu; wxMenu *clip_menu = new wxMenu;
clip_menu->Append(Menu_Copy, "&Copy text\tCtrl-C"); clip_menu->Append(Menu_Copy, _T("&Copy text\tCtrl-C"));
clip_menu->Append(Menu_Paste, "&Paste text\tCtrl-V"); clip_menu->Append(Menu_Paste, _T("&Paste text\tCtrl-V"));
clip_menu->AppendSeparator(); clip_menu->AppendSeparator();
clip_menu->Append(Menu_CopyBitmap, "Copy &bitmap\tCtrl-Shift-C"); clip_menu->Append(Menu_CopyBitmap, _T("Copy &bitmap\tCtrl-Shift-C"));
clip_menu->Append(Menu_PasteBitmap, "Paste b&itmap\tCtrl-Shift-V"); clip_menu->Append(Menu_PasteBitmap, _T("Paste b&itmap\tCtrl-Shift-V"));
#ifdef USE_METAFILES #ifdef USE_METAFILES
clip_menu->AppendSeparator(); clip_menu->AppendSeparator();
clip_menu->Append(Menu_PasteMFile, "Paste &metafile\tCtrl-M"); clip_menu->Append(Menu_PasteMFile, _T("Paste &metafile\tCtrl-M"));
#endif // USE_METAFILES #endif // USE_METAFILES
clip_menu->AppendSeparator(); clip_menu->AppendSeparator();
clip_menu->Append(Menu_CopyFiles, "Copy &files\tCtrl-F"); clip_menu->Append(Menu_CopyFiles, _T("Copy &files\tCtrl-F"));
wxMenuBar *menu_bar = new wxMenuBar; wxMenuBar *menu_bar = new wxMenuBar;
menu_bar->Append(file_menu, "&File"); menu_bar->Append(file_menu, _T("&File"));
menu_bar->Append(log_menu, "&Log"); menu_bar->Append(log_menu, _T("&Log"));
menu_bar->Append(clip_menu, "&Clipboard"); menu_bar->Append(clip_menu, _T("&Clipboard"));
menu_bar->Append(help_menu, "&Help"); menu_bar->Append(help_menu, _T("&Help"));
SetMenuBar(menu_bar); SetMenuBar(menu_bar);
@@ -976,14 +976,14 @@ DnDFrame::DnDFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
wxPoint pos(0, 0); wxPoint pos(0, 0);
wxSize size(400, 200); wxSize size(400, 200);
wxString strFile("Drop files here!"), strText("Drop text on me"); wxString strFile(_T("Drop files here!")), strText(_T("Drop text on me"));
m_ctrlFile = new wxListBox(this, -1, pos, size, 1, &strFile, m_ctrlFile = new wxListBox(this, -1, pos, size, 1, &strFile,
wxLB_HSCROLL | wxLB_ALWAYS_SB ); wxLB_HSCROLL | wxLB_ALWAYS_SB );
m_ctrlText = new wxListBox(this, -1, pos, size, 1, &strText, m_ctrlText = new wxListBox(this, -1, pos, size, 1, &strText,
wxLB_HSCROLL | wxLB_ALWAYS_SB ); wxLB_HSCROLL | wxLB_ALWAYS_SB );
m_ctrlLog = new wxTextCtrl(this, -1, "", pos, size, m_ctrlLog = new wxTextCtrl(this, -1, _T(""), pos, size,
wxTE_MULTILINE | wxTE_READONLY | wxTE_MULTILINE | wxTE_READONLY |
wxSUNKEN_BORDER ); wxSUNKEN_BORDER );
@@ -1050,8 +1050,8 @@ void DnDFrame::OnPaint(wxPaintEvent& WXUNUSED(event))
wxPaintDC dc(this); wxPaintDC dc(this);
// dc.Clear(); -- this kills wxGTK // dc.Clear(); -- this kills wxGTK
dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, "charter" ) ); dc.SetFont( wxFont( 24, wxDECORATIVE, wxNORMAL, wxNORMAL, FALSE, _T("charter") ) );
dc.DrawText( "Drag text from here!", 100, h-50 ); dc.DrawText( _T("Drag text from here!"), 100, h-50 );
} }
void DnDFrame::OnUpdateUIMoveByDefault(wxUpdateUIEvent& event) void DnDFrame::OnUpdateUIMoveByDefault(wxUpdateUIEvent& event)
@@ -1093,11 +1093,11 @@ void DnDFrame::OnDrag(wxCommandEvent& WXUNUSED(event))
{ {
wxString strText = wxGetTextFromUser wxString strText = wxGetTextFromUser
( (
"After you enter text in this dialog, press any mouse\n" _T("After you enter text in this dialog, press any mouse\n")
"button in the bottom (empty) part of the frame and \n" _T("button in the bottom (empty) part of the frame and \n")
"drag it anywhere - you will be in fact dragging the\n" _T("drag it anywhere - you will be in fact dragging the\n")
"text object containing this text", _T("text object containing this text"),
"Please enter some text", m_strText, this _T("Please enter some text"), m_strText, this
); );
m_strText = strText; m_strText = strText;
@@ -1115,10 +1115,10 @@ void DnDFrame::OnDragMoveAllow(wxCommandEvent& event)
void DnDFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void DnDFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{ {
wxMessageBox("Drag-&-Drop Demo\n" wxMessageBox(_T("Drag-&-Drop Demo\n")
"Please see \"Help|Help...\" for details\n" _T("Please see \"Help|Help...\" for details\n")
"Copyright (c) 1998 Vadim Zeitlin", _T("Copyright (c) 1998 Vadim Zeitlin"),
"About wxDnD", _T("About wxDnD"),
wxICON_INFORMATION | wxOK, wxICON_INFORMATION | wxOK,
this); this);
} }
@@ -1126,27 +1126,27 @@ void DnDFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
void DnDFrame::OnHelp(wxCommandEvent& /* event */) void DnDFrame::OnHelp(wxCommandEvent& /* event */)
{ {
wxMessageDialog dialog(this, wxMessageDialog dialog(this,
"This small program demonstrates drag & drop support in wxWindows. The program window\n" _T("This small program demonstrates drag & drop support in wxWindows. The program window\n")
"consists of 3 parts: the bottom pane is for debug messages, so that you can see what's\n" _T("consists of 3 parts: the bottom pane is for debug messages, so that you can see what's\n")
"going on inside. The top part is split into 2 listboxes, the left one accepts files\n" _T("going on inside. The top part is split into 2 listboxes, the left one accepts files\n")
"and the right one accepts text.\n" _T("and the right one accepts text.\n")
"\n" _T("\n")
"To test wxDropTarget: open wordpad (write.exe), select some text in it and drag it to\n" _T("To test wxDropTarget: open wordpad (write.exe), select some text in it and drag it to\n")
"the right listbox (you'll notice the usual visual feedback, i.e. the cursor will change).\n" _T("the right listbox (you'll notice the usual visual feedback, i.e. the cursor will change).\n")
"Also, try dragging some files (you can select several at once) from Windows Explorer (or \n" _T("Also, try dragging some files (you can select several at once) from Windows Explorer (or \n")
"File Manager) to the left pane. Hold down Ctrl/Shift keys when you drop text (doesn't \n" _T("File Manager) to the left pane. Hold down Ctrl/Shift keys when you drop text (doesn't \n")
"work with files) and see what changes.\n" _T("work with files) and see what changes.\n")
"\n" _T("\n")
"To test wxDropSource: just press any mouse button on the empty zone of the window and drag\n" _T("To test wxDropSource: just press any mouse button on the empty zone of the window and drag\n")
"it to wordpad or any other droptarget accepting text (and of course you can just drag it\n" _T("it to wordpad or any other droptarget accepting text (and of course you can just drag it\n")
"to the right pane). Due to a lot of trace messages, the cursor might take some time to \n" _T("to the right pane). Due to a lot of trace messages, the cursor might take some time to \n")
"change, don't release the mouse button until it does. You can change the string being\n" _T("change, don't release the mouse button until it does. You can change the string being\n")
"dragged in in \"File|Test drag...\" dialog.\n" _T("dragged in in \"File|Test drag...\" dialog.\n")
"\n" _T("\n")
"\n" _T("\n")
"Please send all questions/bug reports/suggestions &c to \n" _T("Please send all questions/bug reports/suggestions &c to \n")
"Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>", _T("Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>"),
"wxDnD Help"); _T("wxDnD Help"));
dialog.ShowModal(); dialog.ShowModal();
} }
@@ -1180,28 +1180,28 @@ void DnDFrame::OnLeftDown(wxMouseEvent &WXUNUSED(event) )
else if ( m_moveAllow ) else if ( m_moveAllow )
flags |= wxDrag_AllowMove; flags |= wxDrag_AllowMove;
const char *pc; const wxChar *pc;
switch ( source.DoDragDrop(flags) ) switch ( source.DoDragDrop(flags) )
{ {
case wxDragError: pc = "Error!"; break; case wxDragError: pc = _T("Error!"); break;
case wxDragNone: pc = "Nothing"; break; case wxDragNone: pc = _T("Nothing"); break;
case wxDragCopy: pc = "Copied"; break; case wxDragCopy: pc = _T("Copied"); break;
case wxDragMove: pc = "Moved"; break; case wxDragMove: pc = _T("Moved"); break;
case wxDragCancel: pc = "Cancelled"; break; case wxDragCancel: pc = _T("Cancelled"); break;
default: pc = "Huh?"; break; default: pc = _T("Huh?"); break;
} }
SetStatusText(wxString("Drag result: ") + pc); SetStatusText(wxString(_T("Drag result: ")) + pc);
} }
} }
void DnDFrame::OnRightDown(wxMouseEvent &event ) void DnDFrame::OnRightDown(wxMouseEvent &event )
{ {
wxMenu menu("Dnd sample menu"); wxMenu menu(_T("Dnd sample menu"));
menu.Append(Menu_Drag, "&Test drag..."); menu.Append(Menu_Drag, _T("&Test drag..."));
menu.AppendSeparator(); menu.AppendSeparator();
menu.Append(Menu_About, "&About"); menu.Append(Menu_About, _T("&About"));
PopupMenu( &menu, event.GetX(), event.GetY() ); PopupMenu( &menu, event.GetX(), event.GetY() );
} }
@@ -1222,9 +1222,9 @@ void DnDFrame::OnCopyBitmap(wxCommandEvent& WXUNUSED(event))
{ {
// PNG support is not always compiled in under Windows, so use BMP there // PNG support is not always compiled in under Windows, so use BMP there
#ifdef __WXMSW__ #ifdef __WXMSW__
wxFileDialog dialog(this, "Open a BMP file", "", "", "BMP files (*.bmp)|*.bmp", 0); wxFileDialog dialog(this, _T("Open a BMP file"), _T(""), _T(""), _T("BMP files (*.bmp)|*.bmp"), 0);
#else #else
wxFileDialog dialog(this, "Open a PNG file", "", "", "PNG files (*.png)|*.png", 0); wxFileDialog dialog(this, _T("Open a PNG file"), _T(""), _T(""), _T("PNG files (*.png)|*.png"), 0);
#endif #endif
if (dialog.ShowModal() != wxID_OK) if (dialog.ShowModal() != wxID_OK)
@@ -1366,8 +1366,8 @@ void DnDFrame::OnPasteMetafile(wxCommandEvent& WXUNUSED(event))
void DnDFrame::OnCopyFiles(wxCommandEvent& WXUNUSED(event)) void DnDFrame::OnCopyFiles(wxCommandEvent& WXUNUSED(event))
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
wxFileDialog dialog(this, "Select a file to copy", "", "", wxFileDialog dialog(this, _T("Select a file to copy"), _T(""), _T(""),
"All files (*.*)|*.*", 0); _T("All files (*.*)|*.*"), 0);
wxArrayString filenames; wxArrayString filenames;
while ( dialog.ShowModal() == wxID_OK ) while ( dialog.ShowModal() == wxID_OK )
@@ -1504,14 +1504,14 @@ DnDShapeDialog::DnDShapeDialog(wxFrame *parent, DnDShape *shape)
{ {
m_shape = shape; m_shape = shape;
#if USE_RESOURCES #if USE_RESOURCES
LoadFromResource(parent, "dialogShape"); LoadFromResource(parent, _T("dialogShape"));
m_textX = (wxTextCtrl *)wxFindWindowByName("textX", this); m_textX = (wxTextCtrl *)wxFindWindowByName(_T("textX"), this);
m_textY = (wxTextCtrl *)wxFindWindowByName("textY", this); m_textY = (wxTextCtrl *)wxFindWindowByName(_T("textY"), this);
m_textW = (wxTextCtrl *)wxFindWindowByName("textW", this); m_textW = (wxTextCtrl *)wxFindWindowByName(_T("textW"), this);
m_textH = (wxTextCtrl *)wxFindWindowByName("textH", this); m_textH = (wxTextCtrl *)wxFindWindowByName(_T("textH"), this);
m_radio = (wxRadioBox *)wxFindWindowByName("radio", this); m_radio = (wxRadioBox *)wxFindWindowByName(_T("radio"), this);
#else #else
wxBoxSizer* topSizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* topSizer = new wxBoxSizer( wxVERTICAL );
@@ -1625,8 +1625,8 @@ bool DnDShapeDialog::TransferDataFromWindow()
if ( !m_pos.x || !m_pos.y || !m_size.x || !m_size.y ) if ( !m_pos.x || !m_pos.y || !m_size.x || !m_size.y )
{ {
wxMessageBox("All sizes and positions should be non null!", wxMessageBox(_T("All sizes and positions should be non null!"),
"Invalid shape", wxICON_HAND | wxOK, this); _T("Invalid shape"), wxICON_HAND | wxOK, this);
return FALSE; return FALSE;
} }
@@ -1658,28 +1658,28 @@ void DnDShapeDialog::OnColour(wxCommandEvent& WXUNUSED(event))
DnDShapeFrame *DnDShapeFrame::ms_lastDropTarget = NULL; DnDShapeFrame *DnDShapeFrame::ms_lastDropTarget = NULL;
DnDShapeFrame::DnDShapeFrame(wxFrame *parent) DnDShapeFrame::DnDShapeFrame(wxFrame *parent)
: wxFrame(parent, -1, "Shape Frame", : wxFrame(parent, -1, _T("Shape Frame"),
wxDefaultPosition, wxSize(250, 150)) wxDefaultPosition, wxSize(250, 150))
{ {
CreateStatusBar(); CreateStatusBar();
wxMenu *menuShape = new wxMenu; wxMenu *menuShape = new wxMenu;
menuShape->Append(Menu_Shape_New, "&New default shape\tCtrl-S"); menuShape->Append(Menu_Shape_New, _T("&New default shape\tCtrl-S"));
menuShape->Append(Menu_Shape_Edit, "&Edit shape\tCtrl-E"); menuShape->Append(Menu_Shape_Edit, _T("&Edit shape\tCtrl-E"));
menuShape->AppendSeparator(); menuShape->AppendSeparator();
menuShape->Append(Menu_Shape_Clear, "&Clear shape\tCtrl-L"); menuShape->Append(Menu_Shape_Clear, _T("&Clear shape\tCtrl-L"));
wxMenu *menuClipboard = new wxMenu; wxMenu *menuClipboard = new wxMenu;
menuClipboard->Append(Menu_ShapeClipboard_Copy, "&Copy\tCtrl-C"); menuClipboard->Append(Menu_ShapeClipboard_Copy, _T("&Copy\tCtrl-C"));
menuClipboard->Append(Menu_ShapeClipboard_Paste, "&Paste\tCtrl-V"); menuClipboard->Append(Menu_ShapeClipboard_Paste, _T("&Paste\tCtrl-V"));
wxMenuBar *menubar = new wxMenuBar; wxMenuBar *menubar = new wxMenuBar;
menubar->Append(menuShape, "&Shape"); menubar->Append(menuShape, _T("&Shape"));
menubar->Append(menuClipboard, "&Clipboard"); menubar->Append(menuClipboard, _T("&Clipboard"));
SetMenuBar(menubar); SetMenuBar(menubar);
SetStatusText("Press Ctrl-S to create a new shape"); SetStatusText(_T("Press Ctrl-S to create a new shape"));
SetDropTarget(new DnDShapeDropTarget(this)); SetDropTarget(new DnDShapeDropTarget(this));
@@ -1716,7 +1716,7 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
DnDShapeDataObject shapeData(m_shape); DnDShapeDataObject shapeData(m_shape);
wxDropSource source(shapeData, this); wxDropSource source(shapeData, this);
const char *pc = NULL; const wxChar *pc = NULL;
switch ( source.DoDragDrop(TRUE) ) switch ( source.DoDragDrop(TRUE) )
{ {
default: default:
@@ -1725,15 +1725,15 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
break; break;
case wxDragNone: case wxDragNone:
SetStatusText("Nothing happened"); SetStatusText(_T("Nothing happened"));
break; break;
case wxDragCopy: case wxDragCopy:
pc = "copied"; pc = _T("copied");
break; break;
case wxDragMove: case wxDragMove:
pc = "moved"; pc = _T("moved");
if ( ms_lastDropTarget != this ) if ( ms_lastDropTarget != this )
{ {
// don't delete the shape if we dropped it on ourselves! // don't delete the shape if we dropped it on ourselves!
@@ -1742,13 +1742,13 @@ void DnDShapeFrame::OnDrag(wxMouseEvent& event)
break; break;
case wxDragCancel: case wxDragCancel:
SetStatusText("Drag and drop operation cancelled"); SetStatusText(_T("Drag and drop operation cancelled"));
break; break;
} }
if ( pc ) if ( pc )
{ {
SetStatusText(wxString("Shape successfully ") + pc); SetStatusText(wxString(_T("Shape successfully ")) + pc);
} }
//else: status text already set //else: status text already set
} }
@@ -1776,7 +1776,7 @@ void DnDShapeFrame::OnEditShape(wxCommandEvent& event)
if ( m_shape ) if ( m_shape )
{ {
SetStatusText("You can now drag the shape to another frame"); SetStatusText(_T("You can now drag the shape to another frame"));
} }
} }
} }
@@ -1785,7 +1785,7 @@ void DnDShapeFrame::OnNewShape(wxCommandEvent& event)
{ {
SetShape(new DnDEllipticShape(wxPoint(10, 10), wxSize(80, 60), *wxRED)); SetShape(new DnDEllipticShape(wxPoint(10, 10), wxSize(80, 60), *wxRED));
SetStatusText("You can now drag the shape to another frame"); SetStatusText(_T("You can now drag the shape to another frame"));
} }
void DnDShapeFrame::OnClearShape(wxCommandEvent& event) void DnDShapeFrame::OnClearShape(wxCommandEvent& event)

52
samples/wizard/wizard.cpp
View File

@@ -100,14 +100,14 @@ public:
{ {
m_bitmap = wxBITMAP(wiztest2); m_bitmap = wxBITMAP(wiztest2);
m_checkbox = new wxCheckBox(this, -1, "&Check me"); m_checkbox = new wxCheckBox(this, -1, _T("&Check me"));
} }
virtual bool TransferDataFromWindow() virtual bool TransferDataFromWindow()
{ {
if ( !m_checkbox->GetValue() ) if ( !m_checkbox->GetValue() )
{ {
wxMessageBox("Check the checkbox first!", "No way", wxMessageBox(_T("Check the checkbox first!"), _T("No way"),
wxICON_WARNING | wxOK, this); wxICON_WARNING | wxOK, this);
return FALSE; return FALSE;
@@ -138,12 +138,12 @@ public:
// static wxString choices[] = { "forward", "backward", "both", "neither" }; // static wxString choices[] = { "forward", "backward", "both", "neither" };
// The above syntax can cause an internal compiler error with gcc. // The above syntax can cause an internal compiler error with gcc.
wxString choices[4]; wxString choices[4];
choices[0] = "forward"; choices[0] = _T("forward");
choices[1] = "backward"; choices[1] = _T("backward");
choices[2] = "both"; choices[2] = _T("both");
choices[3] = "neither"; choices[3] = _T("neither");
m_radio = new wxRadioBox(this, -1, "Allow to proceed:", m_radio = new wxRadioBox(this, -1, _T("Allow to proceed:"),
wxPoint(5, 5), wxDefaultSize, wxPoint(5, 5), wxDefaultSize,
WXSIZEOF(choices), choices, WXSIZEOF(choices), choices,
1, wxRA_SPECIFY_COLS); 1, wxRA_SPECIFY_COLS);
@@ -153,7 +153,7 @@ public:
// wizard event handlers // wizard event handlers
void OnWizardCancel(wxWizardEvent& event) void OnWizardCancel(wxWizardEvent& event)
{ {
if ( wxMessageBox("Do you really want to cancel?", "Question", if ( wxMessageBox(_T("Do you really want to cancel?"), _T("Question"),
wxICON_QUESTION | wxYES_NO, this) != wxYES ) wxICON_QUESTION | wxYES_NO, this) != wxYES )
{ {
// not confirmed // not confirmed
@@ -174,7 +174,7 @@ public:
if ( !event.GetDirection() && sel == Backward ) if ( !event.GetDirection() && sel == Backward )
return; return;
wxMessageBox("You can't go there", "Not allowed", wxMessageBox(_T("You can't go there"), _T("Not allowed"),
wxICON_WARNING | wxOK, this); wxICON_WARNING | wxOK, this);
event.Veto(); event.Veto();
@@ -198,10 +198,10 @@ public:
m_prev = prev; m_prev = prev;
m_next = next; m_next = next;
(void)new wxStaticText(this, -1, "Try checking the box below and\n" (void)new wxStaticText(this, -1, _T("Try checking the box below and\n")
"then going back and clearing it"); _T("then going back and clearing it"));
m_checkbox = new wxCheckBox(this, -1, "&Skip the next page", m_checkbox = new wxCheckBox(this, -1, _T("&Skip the next page"),
wxPoint(5, 30)); wxPoint(5, 30));
} }
@@ -249,7 +249,7 @@ IMPLEMENT_APP(MyApp)
// `Main program' equivalent: the program execution "starts" here // `Main program' equivalent: the program execution "starts" here
bool MyApp::OnInit() bool MyApp::OnInit()
{ {
MyFrame *frame = new MyFrame("wxWizard Sample"); MyFrame *frame = new MyFrame(_T("wxWizard Sample"));
// and show it (the frames, unlike simple controls, are not shown when // and show it (the frames, unlike simple controls, are not shown when
// created initially) // created initially)
@@ -268,17 +268,17 @@ MyFrame::MyFrame(const wxString& title)
wxDefaultPosition, wxSize(250, 150)) // small frame wxDefaultPosition, wxSize(250, 150)) // small frame
{ {
wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu;
menuFile->Append(Wizard_Run, "&Run wizard...\tCtrl-R"); menuFile->Append(Wizard_Run, _T("&Run wizard...\tCtrl-R"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Wizard_Quit, "E&xit\tAlt-X", "Quit this program"); menuFile->Append(Wizard_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
wxMenu *helpMenu = new wxMenu; wxMenu *helpMenu = new wxMenu;
helpMenu->Append(Wizard_About, "&About...\tF1", "Show about dialog"); helpMenu->Append(Wizard_About, _T("&About...\tF1"), _T("Show about dialog"));
// now append the freshly created menu to the menu bar... // now append the freshly created menu to the menu bar...
wxMenuBar *menuBar = new wxMenuBar(); wxMenuBar *menuBar = new wxMenuBar();
menuBar->Append(menuFile, "&File"); menuBar->Append(menuFile, _T("&File"));
menuBar->Append(helpMenu, "&Help"); menuBar->Append(helpMenu, _T("&Help"));
// ... and attach this menu bar to the frame // ... and attach this menu bar to the frame
SetMenuBar(menuBar); SetMenuBar(menuBar);
@@ -295,23 +295,23 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
{ {
wxMessageBox("Demo of wxWizard class\n" wxMessageBox(_T("Demo of wxWizard class\n")
"<EFBFBD> 1999, 2000 Vadim Zeitlin", _T("<EFBFBD> 1999, 2000 Vadim Zeitlin"),
"About wxWizard sample", wxOK | wxICON_INFORMATION, this); _T("About wxWizard sample"), wxOK | wxICON_INFORMATION, this);
} }
void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
{ {
wxWizard *wizard = new wxWizard(this, -1, wxWizard *wizard = new wxWizard(this, -1,
"Absolutely Useless Wizard", _T("Absolutely Useless Wizard"),
wxBITMAP(wiztest)); wxBITMAP(wiztest));
// a wizard page may be either an object of predefined class // a wizard page may be either an object of predefined class
wxWizardPageSimple *page1 = new wxWizardPageSimple(wizard); wxWizardPageSimple *page1 = new wxWizardPageSimple(wizard);
wxStaticText *text = new wxStaticText(page1, -1, wxStaticText *text = new wxStaticText(page1, -1,
"This wizard doesn't help you to do anything at all.\n" _T("This wizard doesn't help you to do anything at all.\n")
"\n" _T("\n")
"The next pages will present you with more useless controls." _T("The next pages will present you with more useless controls.")
); );
wxSize size = text->GetBestSize(); wxSize size = text->GetBestSize();
@@ -332,7 +332,7 @@ void MyFrame::OnRunWizard(wxCommandEvent& WXUNUSED(event))
wizard->SetPageSize(size); wizard->SetPageSize(size);
if ( wizard->RunWizard(page1) ) if ( wizard->RunWizard(page1) )
{ {
wxMessageBox("The wizard successfully completed", "That's all", wxMessageBox(_T("The wizard successfully completed"), _T("That's all"),
wxICON_INFORMATION | wxOK); wxICON_INFORMATION | wxOK);
} }