Added some makefiles to HTML samples; added help.ico for wxHTML;

make richedit sample compile (but without clipboard ops)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 560c128109ade8422b047250223dcfe14294195d..697c671c3bdf79ff2c99b830dd439306ef12a0a6 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -910,6 +910,21 @@ samples/html/zip/*.png
 samples/html/zip/*.ico
 samples/html/zip/*.htm
 samples/html/zip/*.html
+samples/html/zip/*.zip
+
+samples/html/helpview/*.cpp
+samples/html/helpview/*.h
+samples/html/helpview/makefile*
+samples/html/helpview/*.rc
+samples/html/helpview/*.def
+samples/html/helpview/*.bmp
+samples/html/helpview/*.xpm
+samples/html/helpview/*.xbm
+samples/html/helpview/*.png
+samples/html/helpview/*.ico
+samples/html/helpview/*.htm
+samples/html/helpview/*.html
+samples/html/helpview/test.zip
 
 samples/richedit/*.cpp
 samples/richedit/*.h

diff --git a/docs/html/index.htm b/docs/html/index.htm
index b5c0f39264988a128c70c990ed87c9764ec9a60f..e561f4b877af6b9e1136b829747141a7ebf83a1b 100644 (file)
--- a/docs/html/index.htm
+++ b/docs/html/index.htm
@@ -216,6 +216,16 @@ fully-fledged application!
 <li><a href="../../samples/help">help</a>: shows how to use wxHelpController.
 <li><a href="../../samples/html">html</a>: a number of demos for the wxHTML class library, used inside
 applications and also as a help facility.
+  <ul>
+  <li><a href="../../samples/html/about">about</a>: shows use of a wxHTML widget inside an About box.
+  <li><a href="../../samples/html/help">help</a>: shows use of wxHtmlHelpController to display wxHTML help.
+  <li><a href="../../samples/html/helpview">helpview</a>: a stand-alone wxHTML help viewer.
+  <li><a href="../../samples/html/printing">printing</a>: shows how easy it is to preview and print HTML files.
+  <li><a href="../../samples/html/test">test</a>: general wxHTML test application.
+  <li><a href="../../samples/html/virtual">virtual</a>: demonstrates the virtual file system feature.
+  <li><a href="../../samples/html/widget">widget</a>: demonstrates the use of controls in HTML pages.
+  <li><a href="../../samples/html/zip">zip</a>: shows how help files can be packaged in zip archives.
+  </ul>
 <li><a href="../../samples/image">image</a>: shows off the cross-platform wxImage class.
 <li><a href="../../samples/internat">internat</a>: use of wxWindows' internationalization support.
 <li><a href="../../samples/joytest">joytest</a>: tests the wxJoystick class (currently Windows and GTK only).

diff --git a/docs/latex/wx/wx.hpj b/docs/latex/wx/wx.hpj
index 5bf567ae88d787ec44eb4b000f61a6857265055a..43d8c3717649f8f6647d6c78559db5dcd8778168 100644 (file)
--- a/docs/latex/wx/wx.hpj
+++ b/docs/latex/wx/wx.hpj
@@ -1,5 +1,5 @@
 [OPTIONS]
-BMROOT=d:\wx2\wxWind~1\docs/latex/wx ; Assume that bitmaps are where the source is
+BMROOT=d:\wx2\wxWindows\docs\latex\wx ; Assume that bitmaps are where the source is
 TITLE=wxWindows Manual
 CONTENTS=Contents
 COMPRESS=HIGH

diff --git a/include/wx/html/msw/help.ico b/include/wx/html/msw/help.ico
new file mode 100644 (file)
index 0000000..b37bc80
Binary files /dev/null and b/include/wx/html/msw/help.ico differ

diff --git a/include/wx/html/msw/wxhtml.rc b/include/wx/html/msw/wxhtml.rc
index 99c310f430e2c549ed326004599cc24bd86bedf4..8aa6f17f6cffabca3eca19d30a1352353592aa25 100644 (file)
--- a/include/wx/html/msw/wxhtml.rc
+++ b/include/wx/html/msw/wxhtml.rc
@@ -13,4 +13,5 @@ panel   BITMAP "wx/html/msw/panel.bmp"
 book    ICON "wx/html/msw/book.ico"
 folder  ICON "wx/html/msw/folder.ico"
 page    ICON "wx/html/msw/page.ico"
+wxhelp  ICON "wx/html/msw/help.ico"
 

diff --git a/samples/html/about/makefile.b32 b/samples/html/about/makefile.b32
new file mode 100644 (file)
index 0000000..934f655
--- /dev/null
+++ b/samples/html/about/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=about
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/about/makefile.wat b/samples/html/about/makefile.wat
new file mode 100644 (file)
index 0000000..02018bb
--- /dev/null
+++ b/samples/html/about/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = about
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/html/help/makefile.b32 b/samples/html/help/makefile.b32
new file mode 100644 (file)
index 0000000..b7ca4da
--- /dev/null
+++ b/samples/html/help/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=help
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/help/makefile.wat b/samples/html/help/makefile.wat
new file mode 100644 (file)
index 0000000..f49017d
--- /dev/null
+++ b/samples/html/help/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = help
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/html/helpview/helpview.rc b/samples/html/helpview/helpview.rc
index 7fa90c817b9b8c3f40f83f42e4b3a31f3a7348a0..131846183bb2a73ba4bb0957959c3cfee410883d 100644 (file)
--- a/samples/html/helpview/helpview.rc
+++ b/samples/html/helpview/helpview.rc
@@ -1,2 +1,5 @@
+/* We need this to get the right default icon. */
+aaaaaa  ICON "wx/html/msw/help.ico"
+
 #include "wx/msw/wx.rc"
 #include "wx/html/msw/wxhtml.rc"

diff --git a/samples/html/helpview/makefile.b32 b/samples/html/helpview/makefile.b32
new file mode 100644 (file)
index 0000000..2e21dfd
--- /dev/null
+++ b/samples/html/helpview/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=helpview
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/helpview/makefile.wat b/samples/html/helpview/makefile.wat
new file mode 100644 (file)
index 0000000..89750a9
--- /dev/null
+++ b/samples/html/helpview/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = helpview
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/html/printing/makefile.b32 b/samples/html/printing/makefile.b32
new file mode 100644 (file)
index 0000000..6e1400d
--- /dev/null
+++ b/samples/html/printing/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=printing
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/printing/makefile.wat b/samples/html/printing/makefile.wat
new file mode 100644 (file)
index 0000000..ebd7bff
--- /dev/null
+++ b/samples/html/printing/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = printing
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/html/test/makefile.b32 b/samples/html/test/makefile.b32
new file mode 100644 (file)
index 0000000..95ddc80
--- /dev/null
+++ b/samples/html/test/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=test
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/test/makefile.wat b/samples/html/test/makefile.wat
new file mode 100644 (file)
index 0000000..81a83e4
--- /dev/null
+++ b/samples/html/test/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = test
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/html/virtual/makefile.b32 b/samples/html/virtual/makefile.b32
new file mode 100644 (file)
index 0000000..38d3152
--- /dev/null
+++ b/samples/html/virtual/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=virtual
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/virtual/makefile.wat b/samples/html/virtual/makefile.wat
new file mode 100644 (file)
index 0000000..c47938e
--- /dev/null
+++ b/samples/html/virtual/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = virtual
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/html/widget/makefile.b32 b/samples/html/widget/makefile.b32
new file mode 100644 (file)
index 0000000..df58de4
--- /dev/null
+++ b/samples/html/widget/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=widget
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/widget/makefile.wat b/samples/html/widget/makefile.wat
new file mode 100644 (file)
index 0000000..e8e5910
--- /dev/null
+++ b/samples/html/widget/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = widget
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/html/zip/makefile.b32 b/samples/html/zip/makefile.b32
new file mode 100644 (file)
index 0000000..ecfe11b
--- /dev/null
+++ b/samples/html/zip/makefile.b32
@@ -0,0 +1,16 @@
+#
+# File:                makefile.b32
+# Author:      Julian Smart
+# Created:     1999
+# Updated:     
+# Copyright:
+#
+# Makefile : Builds sample for 32-bit BC++
+
+WXDIR = $(WXWIN)
+
+TARGET=zip
+OBJECTS = $(TARGET).obj
+
+!include $(WXDIR)\src\makeprog.b32
+

diff --git a/samples/html/zip/makefile.wat b/samples/html/zip/makefile.wat
new file mode 100644 (file)
index 0000000..5a52da2
--- /dev/null
+++ b/samples/html/zip/makefile.wat
@@ -0,0 +1,15 @@
+#
+# Makefile for WATCOM
+#
+# Created by Julian Smart, January 1999
+# 
+#
+
+WXDIR = $(%WXWIN)
+
+PROGRAM = zip
+OBJECTS = $(PROGRAM).obj
+
+!include $(WXDIR)\src\makeprog.wat
+
+

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index 97e4fc200179527a21d46632a7d23b7cdda8cf81..8391d6740777ac012523c0a2c4806a9b79e255db 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -2382,10 +2382,23 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
        cursorPos->y = line->GetLineNumber();
 
    bool foundinline = true;
+   long cx = 0;
+
    // Now, find the object in the line:
-   wxLOiterator i = line->FindObjectScreen(dc, this,
+   wxLOiterator i;
+
+   if (cursorPos)
+   {
+     i = line->FindObjectScreen(dc, this,
+                                           pos.x,
+                                           &cx,
+                                           &foundinline);
+     cursorPos->x = cx;
+   }
+   else
+     i = line->FindObjectScreen(dc, this,
                                            pos.x,
-                                           cursorPos ? &cursorPos->x : NULL,
+                                           NULL,
                                            &foundinline);
    if ( found )
       *found = didFind && foundinline;
@@ -2831,8 +2844,9 @@ wxLayoutList::GetSelection(wxLayoutDataObject *wxlo, bool invalidate)
             exp->content.object->Write(string);
          delete exp;
       }
-
+#if 0 // FIXME: DnD/Clipboard API has changed, what should this be?
       wxlo->SetData(string.c_str(), string.Length()+1);
+#endif
    }
    return llist;
 }

diff --git a/samples/richedit/wxllist.h b/samples/richedit/wxllist.h
index 940e3aca6b6cb4fb019e16ecfd6c187655324563..39fe17864628ad2613af736940a3866e15939ddd 100644 (file)
--- a/samples/richedit/wxllist.h
+++ b/samples/richedit/wxllist.h
@@ -1215,12 +1215,14 @@ private:
    own format.
 
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-class wxLayoutDataObject : public wxPrivateDataObject
+class wxLayoutDataObject : public wxCustomDataObject
 {
 public:
    wxLayoutDataObject(void)
       {
+#if 0 // TODO: No longer exists, what should we do instead?
          SetId("application/wxlayoutlist");
+#endif
          //m_format.SetAtom((GdkAtom) 222222);
       }
 };

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index c2c73c171c12b4b94c356a19a2b4b7d61fb192a7..43ec7781c48bca7184141435c294dd5c69c05b85 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -1099,7 +1099,7 @@ wxLayoutWindow::Paste(bool primary)
          wxTextDataObject data;
          if (wxTheClipboard->IsSupported( data.GetFormat() ))
          {
-            wxTheClipboard->GetData(&data);
+            wxTheClipboard->GetData(data);
             wxString text = data.GetText();
             wxLayoutImportText( m_llist, text);
             SetDirty();

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index e4162ea35dc60e53d2d97e823ed7062a0acb379f..5391df1b7dd444bc0611e4c5418fa241649c3aec 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -139,6 +139,12 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, const wxString& ti
 
     wxFrame::Create(parent, id, _("Help"), wxPoint(m_Cfg.x, m_Cfg.y), wxSize(m_Cfg.w, m_Cfg.h));
 
+#ifdef __WXMSW__
+    wxIcon frameIcon("wxhelp", wxBITMAP_TYPE_ICO_RESOURCE);
+    if (frameIcon.Ok())
+        SetIcon(frameIcon);
+#endif
+
     int notebook_page = 0;
 
     CreateStatusBar();

diff --git a/utils/projgen/makeproj.cpp b/utils/projgen/makeproj.cpp
index 1dc76015c5ccc72390d381f39e178cd29b6c254d..821d7bd4970dc963106c8c0aac83c10dfb466d67 100644 (file)
--- a/utils/projgen/makeproj.cpp
+++ b/utils/projgen/makeproj.cpp
@@ -227,6 +227,7 @@ void MyApp::GenerateSamples(const wxString& dir)
     GenerateSample("VirtualVC", "virtual", dir + wxString("/samples/html/virtual"), wxStringList("virtual.cpp", 0));
     GenerateSample("WidgetVC", "widget", dir + wxString("/samples/html/widget"), wxStringList("widget.cpp", 0));
     GenerateSample("ZipVC", "zip", dir + wxString("/samples/html/zip"), wxStringList("zip.cpp", 0));
+    GenerateSample("HelpViewVC", "helpview", dir + wxString("/samples/html/helpview"), wxStringList("helpview.cpp", 0));
 
     GenerateSample("ImageVC", "image", dir + wxString("/samples/image"), wxStringList("image.cpp", 0));
     GenerateSample("InternatVC", "internat", dir + wxString("/samples/internat"), wxStringList("internat.cpp", 0));