Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Julian Smart
1999-11-01 11:27:38 +00:00
parent 737f4d3d79
commit 9ffdee8074
27 changed files with 306 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
distrib/msw/generic.rsp
View File

@@ -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

10
docs/html/index.htm
View File

@@ -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).

2
docs/latex/wx/wx.hpj
View File

@@ -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

BIN
include/wx/html/msw/help.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

1
include/wx/html/msw/wxhtml.rc
View File

@@ -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"

16
samples/html/about/makefile.b32 Normal file
View File

@@ -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

15
samples/html/about/makefile.wat Normal file
View File

@@ -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

16
samples/html/help/makefile.b32 Normal file
View File

@@ -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

15
samples/html/help/makefile.wat Normal file
View File

@@ -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

3
samples/html/helpview/helpview.rc
View File

@@ -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"

16
samples/html/helpview/makefile.b32 Normal file
View File

@@ -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

15
samples/html/helpview/makefile.wat Normal file
View File

@@ -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

16
samples/html/printing/makefile.b32 Normal file
View File

@@ -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

15
samples/html/printing/makefile.wat Normal file
View File

@@ -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

16
samples/html/test/makefile.b32 Normal file
View File

@@ -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

15
samples/html/test/makefile.wat Normal file
View File

@@ -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

16
samples/html/virtual/makefile.b32 Normal file
View File

@@ -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

15
samples/html/virtual/makefile.wat Normal file
View File

@@ -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

16
samples/html/widget/makefile.b32 Normal file
View File

@@ -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

15
samples/html/widget/makefile.wat Normal file
View File

@@ -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

16
samples/html/zip/makefile.b32 Normal file
View File

@@ -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

15
samples/html/zip/makefile.wat Normal file
View File

@@ -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

20
samples/richedit/wxllist.cpp
View File

@@ -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,
cursorPos ? &cursorPos->x : NULL,
&cx,
&foundinline);
cursorPos->x = cx;
}
else
i = line->FindObjectScreen(dc, this,
pos.x,
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;
}

4
samples/richedit/wxllist.h
View File

@@ -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);
}
};

2
samples/richedit/wxlwindow.cpp
View File

@@ -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();

6
src/html/helpfrm.cpp
View File

@@ -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();

1
utils/projgen/makeproj.cpp
View File

@@ -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));