fix for dmc compilation of projects with more than one obj

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

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index 2c60e72580e7c3b60ea297f79cf4214431a03638..eac43f4e19dce8ca9bc987d9494f870a9945cd1d 100644 (file)
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -3,13 +3,13 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
     #pragma implementation "test.cpp"
     #pragma interface "test.cpp"
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -18,11 +18,13 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP

-    #include <wx/wx.h>
+    #include "wx/wx.h"

 #endif
 
 #endif
 

-#include <wx/image.h>
-#include <wx/wxhtml.h>
+#include "wx/image.h"
+#include "wx/imagpng.h"
+#include "wx/wxhtml.h"
+#include "wx/statline.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -72,7 +74,7 @@
    Minimal_Forward,
 
     // controls start here (the numbers are, of course, arbitrary)
    Minimal_Forward,
 
     // controls start here (the numbers are, of course, arbitrary)

-   Minimal_Text = 1000,
+   Minimal_Text = 1000

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


@@ -106,7 +108,7 @@
    {
     wxImage::AddHandler(new wxPNGHandler);
     // Create the main application window
    {
     wxImage::AddHandler(new wxPNGHandler);
     // Create the main application window

-      MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
+      MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),

          wxPoint(50, 50), wxSize(150, 50));
 
     // Show it and tell the application that it's our main window
          wxPoint(50, 50), wxSize(150, 50));
 
     // Show it and tell the application that it's our main window


@@ -133,12 +135,12 @@
     // create a menu bar
       wxMenu *menuFile = new wxMenu;
 
     // create a menu bar
       wxMenu *menuFile = new wxMenu;
 

-      menuFile->Append(Minimal_About, "&About");
-      menuFile->Append(Minimal_Quit, "E&xit");
+      menuFile->Append(Minimal_About, _("&About"));
+      menuFile->Append(Minimal_Quit, _("E&xit"));

 
     // now append the freshly created menu to the menu bar...
       wxMenuBar *menuBar = new wxMenuBar;
 
     // now append the freshly created menu to the menu bar...
       wxMenuBar *menuBar = new wxMenuBar;

-      menuBar->Append(menuFile, "&File");
+      menuBar->Append(menuFile, _("&File"));

 
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);


@@ -155,24 +157,31 @@
 
    void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
    {
 
    void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
    {

+        wxBoxSizer *topsizer;

         wxHtmlWindow *html;
         wxHtmlWindow *html;

-#if __WXMSW__
-        wxDialog dlg(this, -1, "About", wxDefaultPosition, wxSize(400, 250), wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE);
-#else
-        wxDialog dlg(this, -1, "About", wxDefaultPosition, wxSize(400, 230), wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE);
-#endif
+        wxDialog dlg(this, -1, wxString(_("About")));

 
 

-        html = new wxHtmlWindow(&dlg, -1, wxPoint(10, 10), wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
-        html -> SetBorders(0);
-        html -> LoadPage("data/about.htm");
-        wxButton *bu1 = new wxButton(&dlg, wxID_OK, "OK", wxPoint(250, 185), wxSize(100, 30));
-        bu1 -> SetDefault();
-        dlg.ShowModal();
-    }
+        topsizer = new wxBoxSizer(wxVERTICAL);

 
 

+        html = new wxHtmlWindow(&dlg, -1, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
+        html -> SetBorders(0);
+        html -> LoadPage(wxT("data/about.htm"));
+        html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(), 
+                        html -> GetInternalRepresentation() -> GetHeight());

 
 

+        topsizer -> Add(html, 1, wxALL, 10);

 
 

+        topsizer -> Add(new wxStaticLine(&dlg, -1), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+                        
+        wxButton *bu1 = new wxButton(&dlg, wxID_OK, _("OK"));
+        bu1 -> SetDefault();

 
 

+        topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);

 
 

+        dlg.SetAutoLayout(TRUE);
+        dlg.SetSizer(topsizer);
+        topsizer -> Fit(&dlg);

 
 

+        dlg.ShowModal();
+    }