moving libiconv and libz into linker flags, as Xcode resolves the links otherwise...

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 1c998979ceb3ce0d2cc2c54f2962fef5586e1c87..301cb0f7dd713441341978bfdd19b24d434929bb 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -4,8 +4,8 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(__APPLE__)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(__APPLE__)

-    #pragma implementation "help.cpp"
-    #pragma interface "help.cpp"
+    #pragma implementation
+    #pragma interface

 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".


@@ -60,7 +60,7 @@
       void OnClose(wxCloseEvent& event);
    private:
       wxHtmlHelpController help;
       void OnClose(wxCloseEvent& event);
    private:
       wxHtmlHelpController help;

-   
+

     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
    };
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
    };


@@ -108,15 +108,15 @@
    bool MyApp::OnInit()
    {
       wxInitAllImageHandlers();
    bool MyApp::OnInit()
    {
       wxInitAllImageHandlers();

-#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB 
+#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB

       wxFileSystem::AddHandler(new wxZipFSHandler);
 #endif
       SetVendorName(wxT("wxWidgets"));
       wxFileSystem::AddHandler(new wxZipFSHandler);
 #endif
       SetVendorName(wxT("wxWidgets"));

-      SetAppName(wxT("wxHTMLHelp")); 
+      SetAppName(wxT("wxHTMLHelp"));

 
     // Create the main application window
       MyFrame *frame = new MyFrame(_("HTML Help Sample"),
 
     // Create the main application window
       MyFrame *frame = new MyFrame(_("HTML Help Sample"),

-         wxPoint(50, 50), wxSize(150, 50));
+         wxDefaultPosition, wxDefaultSize);

 
     // Show it and tell the application that it's our main window
     // @@@ what does it do exactly, in fact? is it necessary here?
 
     // Show it and tell the application that it's our main window
     // @@@ what does it do exactly, in fact? is it necessary here?


@@ -137,7 +137,7 @@
 
 // frame constructor
    MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
 
 // frame constructor
    MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)

-   : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), 
+   : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size),

      help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)
    {
     // create a menu bar
      help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)
    {
     // create a menu bar


@@ -185,7 +185,7 @@
        if ( help.GetFrame() ) // returns NULL if no help frame active
            help.GetFrame()->Close(true);
        // now we can safely delete the config pointer
        if ( help.GetFrame() ) // returns NULL if no help frame active
            help.GetFrame()->Close(true);
        // now we can safely delete the config pointer

-       event.Skip();   
+       event.Skip();

        delete wxConfig::Set(NULL);
    }
 
        delete wxConfig::Set(NULL);
    }