Fix for missing -g from wx-config

[wxWidgets.git] / samples / html / zip / zip.cpp

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 3f518da66465978f0d567cd47939bf2790095a3e..2b0fa15f98af8ba7a60d9addf85529b036bedf15 100644 (file)
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -35,7 +35,7 @@
    public:
     // override base class virtuals
     // ----------------------------
    public:
     // override base class virtuals
     // ----------------------------

-   
+

     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)
     // this one is called on application startup and is a good place for the app
     // initialization (doing it here and not in the ctor allows to have an error
     // return: if OnInit() returns false, the application terminates)


@@ -48,7 +48,7 @@
    public:
     // ctor(s)
       MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
    public:
     // ctor(s)
       MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

-   
+

     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
       void OnAbout(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
       void OnAbout(wxCommandEvent& event);


@@ -71,10 +71,7 @@
    Minimal_Quit = 1,
    Minimal_About,
    Minimal_Back,
    Minimal_Quit = 1,
    Minimal_About,
    Minimal_Back,

-   Minimal_Forward,
-   
-    // controls start here (the numbers are, of course, arbitrary)
-   Minimal_Text = 1000,
+   Minimal_Forward

    };
 
 // ----------------------------------------------------------------------------
    };
 
 // ----------------------------------------------------------------------------


@@ -90,18 +87,18 @@
    EVT_MENU(Minimal_Back, MyFrame::OnBack)
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
    END_EVENT_TABLE()
    EVT_MENU(Minimal_Back, MyFrame::OnBack)
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
    END_EVENT_TABLE()

-   
+

    // Create a new application object: this macro will allow wxWindows to create
    // the application object during program execution (it's better than using a
    // static object for many reasons) and also declares the accessor function
    // wxGetApp() which will return the reference of the right type (i.e. MyApp and
    // not wxApp)
    IMPLEMENT_APP(MyApp)
    // Create a new application object: this macro will allow wxWindows to create
    // the application object during program execution (it's better than using a
    // static object for many reasons) and also declares the accessor function
    // wxGetApp() which will return the reference of the right type (i.e. MyApp and
    // not wxApp)
    IMPLEMENT_APP(MyApp)

-   
+

    // ============================================================================
    // implementation
    // ============================================================================
    // ============================================================================
    // implementation
    // ============================================================================

-   
+

    // ----------------------------------------------------------------------------
    // the application class
    // ----------------------------------------------------------------------------
    // ----------------------------------------------------------------------------
    // the application class
    // ----------------------------------------------------------------------------


@@ -114,18 +111,18 @@
      #if wxUSE_LIBJPEG
      wxImage::AddHandler(new wxJPEGHandler);
      #endif
      #if wxUSE_LIBJPEG
      wxImage::AddHandler(new wxJPEGHandler);
      #endif

-     
+

      wxFileSystem::AddHandler(new wxZipFSHandler);
      wxFileSystem::AddHandler(new wxZipFSHandler);

-     
+

     // Create the main application window
       MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
          wxPoint(50, 50), wxSize(640, 480));
     // 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);
     // 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);

-   
+

     // 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.
     // 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.


@@ -157,7 +154,7 @@ wxHtmlWindow *html;
 
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);

-   
+

       CreateStatusBar(1);
 
       {
       CreateStatusBar(1);
 
       {