wxMotif compilation fixes after wxDC changes

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

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index a97c5e58c3854750d850715dc6c4d5762302a761..9613d9890f8789de8c4cd0f020bb4f128ac18237 100644 (file)
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -3,28 +3,23 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "test.cpp"
-    #pragma interface "test.cpp"
-#endif
-

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

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

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

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

 #endif
 
 #endif
 

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

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


@@ -32,156 +27,139 @@
 
 
 // Define a new application type, each program should derive a class from wxApp
 
 
 // Define a new application type, each program should derive a class from wxApp

-   class MyApp : public wxApp
-   {
-   public:
+class MyApp : public wxApp
+{
+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)
     // 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)

-      virtual bool OnInit();
-   };
+    virtual bool OnInit();
+};

 
 // Define a new frame type: this is going to be our main frame
 
 // Define a new frame type: this is going to be our main frame

-   class MyFrame : public wxFrame
-   {
-   public:
+class MyFrame : public wxFrame
+{
+public:

     // ctor(s)
     // ctor(s)

-      MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyFrame(const wxString& title);

 
     // event handlers (these functions should _not_ be virtual)
 
     // event handlers (these functions should _not_ be virtual)

-      void OnQuit(wxCommandEvent& event);
-      void OnAbout(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);

 
 

-   private:
-    // any class wishing to process wxWindows events must use this macro
+private:
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

-   };
+};

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// constants
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// IDs for the controls and the menu commands
-   enum
-   {
-    // menu items
-   Minimal_Quit = 1,
-   Minimal_About,
-   Minimal_Back,
-   Minimal_Forward,
-
-    // controls start here (the numbers are, of course, arbitrary)
-   Minimal_Text = 1000
-   };
+// the event tables connect the wxWidgets events with the functions (event
+// handlers) which process them. It can be also done at run-time, but for the
+// simple menu events like this the static method is much simpler.
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
+   EVT_MENU(wxID_ABOUT, MyFrame::OnAbout)
+   EVT_MENU(wxID_EXIT,  MyFrame::OnQuit)
+END_EVENT_TABLE()
+
+// Create a new application object: this macro will allow wxWidgets 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
+// ============================================================================

 
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// the application class

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
-// handlers) which process them. It can be also done at run-time, but for the
-// 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)
-   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)
-
-   // ============================================================================
-   // implementation
-   // ============================================================================
-
-   // ----------------------------------------------------------------------------
-   // the application class
-   // ----------------------------------------------------------------------------
-   // `Main program' equivalent: the program execution "starts" here
-   bool MyApp::OnInit()
-   {
-    wxImage::AddHandler(new wxPNGHandler);
-    // Create the main application window
-      MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
-         wxPoint(50, 50), wxSize(150, 50));
+// `Main program' equivalent: the program execution "starts" here
+bool MyApp::OnInit()
+{
+    if ( !wxApp::OnInit() )
+        return false;

 
 

-    // 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);
+    // we use a PNG image in our HTML page
+    wxImage::AddHandler(new wxPNGHandler);

 
 

+    // create and show the main application window
+    MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"));
+    frame->Show();

 
     // success: wxApp::OnRun() will be called which will enter the main message
 
     // success: wxApp::OnRun() will be called which will enter the main message

-    // loop and the application will run. If we returned FALSE here, the
+    // loop and the application will run. If we returned false here, the

     // application would exit immediately.
     // application would exit immediately.

-      return TRUE;
-   }
+    return true;
+}

 
 // ----------------------------------------------------------------------------
 // main frame
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // main frame
 // ----------------------------------------------------------------------------
 

-

 // frame constructor
 // frame constructor

-   MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
-   : wxFrame((wxFrame *)NULL, -1, title, pos, size)
-   {
+MyFrame::MyFrame(const wxString& title)
+       : wxFrame((wxFrame *)NULL, wxID_ANY, title)
+{

     // create a menu bar
     // create a menu bar

-      wxMenu *menuFile = new wxMenu;
+    wxMenu *menuFile = new wxMenu;

 
 

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

 
     // now append the freshly created menu to the menu bar...
 
     // now append the freshly created menu to the menu bar...

-      wxMenuBar *menuBar = new wxMenuBar;
-      menuBar->Append(menuFile, "&File");
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(menuFile, _("&File"));

 
     // ... and attach this menu bar to the frame
 
     // ... and attach this menu bar to the frame

-      SetMenuBar(menuBar);
-   }
+    SetMenuBar(menuBar);
+}

 
 
 // event handlers
 
 
 
 // event handlers
 

-   void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
-   {
-    // TRUE is to force the frame to close
-      Close(TRUE);
-   }
+void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
+{
+    // true is to force the frame to close
+    Close(true);
+}
+
+void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
+{
+    wxBoxSizer *topsizer;
+    wxHtmlWindow *html;
+    wxDialog dlg(this, wxID_ANY, wxString(_("About")));

 
 

-   void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-   {
-        wxBoxSizer *topsizer;
-        wxHtmlWindow *html;
-        wxDialog dlg(this, -1, wxString("About"));
+    topsizer = new wxBoxSizer(wxVERTICAL);

 
 

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

 
 

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

 
 

-        topsizer -> Add(html, 1, wxALL, 10);
+#if wxUSE_STATLINE
+    topsizer -> Add(new wxStaticLine(&dlg, wxID_ANY), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+#endif // wxUSE_STATLINE

 
 

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

 
 

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

 
 

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

 
 

-        dlg.ShowModal();
-    }
+    dlg.ShowModal();
+}