WinCE build fix.

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

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index 5ca80e47e4a85d94e4d691b10b87af487cae6b72..c003f9cb197e73389082ace63f8f33b4d36ffdc7 100755 (executable)
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -25,7 +25,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #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
     #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif


@@ -36,12 +36,6 @@
 // resources
 // ----------------------------------------------------------------------------
 
 // resources
 // ----------------------------------------------------------------------------
 

-// the application icon (under Windows and OS/2 it is in resources and even
-// though we could still include the XPM here it would be unused)
-#if !defined(__WXMSW__) && !defined(__WXPM__)
-    #include "../../sample.xpm"
-#endif
-

 enum {
     ID_BACK = wxID_HIGHEST + 1,
     ID_NEXT = wxID_HIGHEST + 2,
 enum {
     ID_BACK = wxID_HIGHEST + 1,
     ID_NEXT = wxID_HIGHEST + 2,


@@ -89,15 +83,15 @@ public:
     wxWebKitCtrl* mySafari;
     wxTextCtrl* urlText;
 private:
     wxWebKitCtrl* mySafari;
     wxTextCtrl* urlText;
 private:

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

     DECLARE_EVENT_TABLE()
 };
 
 // ----------------------------------------------------------------------------
     DECLARE_EVENT_TABLE()
 };
 
 // ----------------------------------------------------------------------------

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

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

-// the event tables connect the wxWindows events with the functions (event
+// 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)
 // 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)


@@ -113,7 +107,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     //EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
     //EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 

-// Create a new application object: this macro will allow wxWindows to create
+// 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 implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and


@@ -131,6 +125,9 @@ IMPLEMENT_APP(MyApp)
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {
 // 'Main program' equivalent: the program execution "starts" here
 bool MyApp::OnInit()
 {

+    if ( !wxApp::OnInit() )
+        return false;
+

     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxWebKit Sample"));
 
     // create the main application window
     MyFrame *frame = new MyFrame(_T("wxWebKit Sample"));
 


@@ -186,8 +183,24 @@ MyFrame::MyFrame(const wxString& title)
     myToolbar->AddSeparator();
     myToolbar->Realize();
 
     myToolbar->AddSeparator();
     myToolbar->Realize();
 

-    mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+    // Testing wxWebKitCtrl inside a panel
+#if 1
+    wxPanel* panel = new wxPanel(this, wxID_ANY);
+
+    wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
+    panel->SetSizer(boxSizer);

 
 

+    mySafari = new wxWebKitCtrl(panel, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+
+    boxSizer->Add(mySafari, 1, wxEXPAND);
+
+    wxBoxSizer* frameSizer = new wxBoxSizer(wxVERTICAL);
+    SetSizer(frameSizer);
+    frameSizer->Add(panel, 1, wxEXPAND);
+#else
+    mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+#endif
+    

 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
 #endif // wxUSE_STATUSBAR


@@ -208,7 +221,7 @@ void MyFrame::OnStopButton(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnReloadButton(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnReloadButton(wxCommandEvent& myEvent){

-       mySafari->Reload();
+    mySafari->Reload();

 }
 
 void MyFrame::OnURLEnter(wxCommandEvent& myEvent){
 }
 
 void MyFrame::OnURLEnter(wxCommandEvent& myEvent){


@@ -219,6 +232,7 @@ void MyFrame::OnStateChanged(wxWebKitStateChangedEvent& myEvent){
     if (GetStatusBar() != NULL){
         if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING){
             GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL());
     if (GetStatusBar() != NULL){
         if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING){
             GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL());

+            urlText->SetValue(myEvent.GetURL());

         }
         else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING){
             GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL());
         }
         else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING){
             GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL());