Patch [ 584078 ] Misc samples fixes from Dimitri Schoolwerth
Addresses: printf-format warinigs indentation/style unused variable warnings used wxID_ABOUT for about menu entry removed references to "minimal sample" in other samples some other misc warinigs git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -103,7 +103,6 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& fs, const wxString& location)
 | 
			
		||||
   
 | 
			
		||||
    // event handlers (these functions should _not_ be virtual)
 | 
			
		||||
      void OnQuit(wxCommandEvent& event);
 | 
			
		||||
      void OnAbout(wxCommandEvent& event);
 | 
			
		||||
      void OnBack(wxCommandEvent& event);
 | 
			
		||||
      void OnForward(wxCommandEvent& event);
 | 
			
		||||
 | 
			
		||||
@@ -121,7 +120,6 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& fs, const wxString& location)
 | 
			
		||||
   {
 | 
			
		||||
    // menu items
 | 
			
		||||
   Minimal_Quit = 1,
 | 
			
		||||
   Minimal_About,
 | 
			
		||||
   Minimal_Back,
 | 
			
		||||
   Minimal_Forward,
 | 
			
		||||
   
 | 
			
		||||
@@ -138,7 +136,6 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& fs, const wxString& location)
 | 
			
		||||
// simple menu events like this the static method is much simpler.
 | 
			
		||||
   BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 | 
			
		||||
   EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
 | 
			
		||||
   EVT_MENU(Minimal_About, MyFrame::OnAbout)
 | 
			
		||||
   EVT_MENU(Minimal_Back, MyFrame::OnBack)
 | 
			
		||||
   EVT_MENU(Minimal_Forward, MyFrame::OnForward)
 | 
			
		||||
   END_EVENT_TABLE()
 | 
			
		||||
@@ -164,13 +161,13 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& fs, const wxString& location)
 | 
			
		||||
    // Create the main application window
 | 
			
		||||
      MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
 | 
			
		||||
         wxPoint(50, 50), wxSize(640, 480));
 | 
			
		||||
   
 | 
			
		||||
 | 
			
		||||
    // Show it and tell the application that it's our main window
 | 
			
		||||
    // @@@ what does it do exactly, in fact? is it necessary here?
 | 
			
		||||
      frame->Show(TRUE);
 | 
			
		||||
      SetTopWindow(frame);
 | 
			
		||||
      wxFileSystem::AddHandler(new MyVFS);
 | 
			
		||||
   
 | 
			
		||||
 | 
			
		||||
    // success: wxApp::OnRun() will be called which will enter the main message
 | 
			
		||||
    // loop and the application will run. If we returned FALSE here, the
 | 
			
		||||
    // application would exit immediately.
 | 
			
		||||
@@ -220,12 +217,6 @@ wxHtmlWindow *html;
 | 
			
		||||
      Close(TRUE);
 | 
			
		||||
   }
 | 
			
		||||
 | 
			
		||||
   void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 | 
			
		||||
   {
 | 
			
		||||
   }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
   void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
 | 
			
		||||
   {
 | 
			
		||||
   if (!html -> HistoryBack()) wxMessageBox("You reached prehistory era!");
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user