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

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