diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp index 7740b6299a..088a5a7d2b 100644 --- a/samples/nativdlg/nativdlg.cpp +++ b/samples/nativdlg/nativdlg.cpp @@ -35,45 +35,45 @@ wxIMPLEMENT_APP(MyApp); bool MyApp::OnInit(void) { - if ( !wxApp::OnInit() ) - return false; + if ( !wxApp::OnInit() ) + return false; - // Create the main frame window - MyFrame *frame = new MyFrame(NULL, wxID_ANY, "wxWidgets Native Dialog Sample", wxDefaultPosition, wxDefaultSize); + // Create the main frame window + MyFrame* frame = new MyFrame(NULL, wxID_ANY, "wxWidgets Native Dialog Sample", wxDefaultPosition, wxDefaultSize); #if wxUSE_STATUSBAR - // Give it a status line - frame->CreateStatusBar(2); + // Give it a status line + frame->CreateStatusBar(2); #endif // wxUSE_STATUSBAR - // Make a menubar - wxMenu *file_menu = new wxMenu; + // Make a menubar + wxMenu* file_menu = new wxMenu; - file_menu->Append(RESOURCE_TEST1, "&Dialog box test", "Test dialog box resource"); - file_menu->Append(RESOURCE_QUIT, "E&xit", "Quit program"); + file_menu->Append(RESOURCE_TEST1, "&Dialog box test", "Test dialog box resource"); + file_menu->Append(RESOURCE_QUIT, "E&xit", "Quit program"); - wxMenuBar *menu_bar = new wxMenuBar; + wxMenuBar* menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(file_menu, "&File"); - // Associate the menu bar with the frame - frame->SetMenuBar(menu_bar); + // Associate the menu bar with the frame + frame->SetMenuBar(menu_bar); - // Make a panel - frame->panel = new wxWindow(frame, wxID_ANY); - frame->Show(true); + // Make a panel + frame->panel = new wxWindow(frame, wxID_ANY); + frame->Show(true); - return true; + return true; } wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit) - EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1) +EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit) +EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1) wxEND_EVENT_TABLE() // Define my frame constructor -MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size): - wxFrame(parent, id, title, pos, size) +MyFrame::MyFrame(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size) : + wxFrame(parent, id, title, pos, size) { SetIcon(wxICON(sample)); @@ -82,19 +82,19 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(true); + Close(true); } void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) { #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) MyDialog dialog; - if (dialog.LoadNativeDialog(this, "dialog1")) + if ( dialog.LoadNativeDialog(this, "dialog1") ) { dialog.ShowModal(); } #else - wxMessageBox("No native dialog support","Platform limitation"); + wxMessageBox("No native dialog support", "Platform limitation"); #endif } diff --git a/samples/nativdlg/nativdlg.h b/samples/nativdlg/nativdlg.h index 732f881704..bedc78786f 100644 --- a/samples/nativdlg/nativdlg.h +++ b/samples/nativdlg/nativdlg.h @@ -9,31 +9,31 @@ ///////////////////////////////////////////////////////////////////////////// // Define a new application -class MyApp: public wxApp +class MyApp : public wxApp { - public: - MyApp(void){} +public: + MyApp(void) {} bool OnInit(void) wxOVERRIDE; }; -class MyFrame: public wxFrame +class MyFrame : public wxFrame { - public: - wxWindow *panel; - MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size); +public: + wxWindow* panel; + MyFrame(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size); void OnQuit(wxCommandEvent& event); void OnTest1(wxCommandEvent& event); - wxDECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; class MyDialog : public wxDialog { - public: +public: void OnOk(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); - wxDECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #define RESOURCE_QUIT 4