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

Applied docview patch

Browse Source 
Removed richedit sample compilation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-04-12 13:15:44 +00:00
parent ad1b0610dc
commit bb28b47763
11 changed files with 30 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
distrib/msw/generic.rsp
View File

@@ -913,21 +913,6 @@ samples/resource/*.xpm
samples/resource/*.ico samples/resource/*.ico
samples/resource/*.pro samples/resource/*.pro
samples/richedit/*.cpp
samples/richedit/*.h
samples/richedit/makefile*
samples/richedit/*.rc
samples/richedit/*.def
samples/richedit/*.bmp
samples/richedit/*.xpm
samples/richedit/*.xbm
samples/richedit/*.png
samples/richedit/*.ico
samples/richedit/*.txt
samples/richedit/*.pro
samples/richedit/TODO
samples/richedit/README
samples/rotate/*.cpp samples/rotate/*.cpp
samples/rotate/*.h samples/rotate/*.h
samples/rotate/makefile* samples/rotate/makefile*

1
distrib/msw/makefile.rsp
View File

@@ -26,7 +26,6 @@ samples/help/Makefile.in
samples/internat/Makefile.in samples/internat/Makefile.in
samples/ipc/Makefile.in samples/ipc/Makefile.in
samples/png/Makefile.in samples/png/Makefile.in
samples/richedit/Makefile.in
samples/resource/Makefile.in samples/resource/Makefile.in
samples/sockets/Makefile.in samples/sockets/Makefile.in
samples/html/Makefile.in samples/html/Makefile.in

3
distrib/msw/vc.rsp
View File

@@ -182,9 +182,6 @@ samples/regtest/regtest.dsw
samples/resource/resource.dsp samples/resource/resource.dsp
samples/resource/resource.dsw samples/resource/resource.dsw
samples/richedit/richedit.dsp
samples/richedit/richedit.dsw
samples/rotate/rotate.dsp samples/rotate/rotate.dsp
samples/rotate/rotate.dsw samples/rotate/rotate.dsw

2
include/wx/docview.h
View File

@@ -171,7 +171,7 @@ public:
~wxView(); ~wxView();
wxDocument *GetDocument() const { return m_viewDocument; } wxDocument *GetDocument() const { return m_viewDocument; }
void SetDocument(wxDocument *doc); virtual void SetDocument(wxDocument *doc);
wxString GetViewName() const { return m_viewTypeName; } wxString GetViewName() const { return m_viewTypeName; }
void SetViewName(const wxString& name) { m_viewTypeName = name; }; void SetViewName(const wxString& name) { m_viewTypeName = name; };

2
include/wx/menuitem.h
View File

@@ -71,7 +71,7 @@ public:
// what kind of menu item we are // what kind of menu item we are
wxItemKind GetKind() const { return m_kind; } wxItemKind GetKind() const { return m_kind; }
virtual void SetCheckable(bool checkable) { m_kind = wxITEM_CHECK; } virtual void SetCheckable(bool checkable) { m_kind = checkable ? wxITEM_CHECK : wxITEM_NORMAL; }
bool IsCheckable() const bool IsCheckable() const
{ return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; } { return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }

10
samples/makefile.b32
View File

@@ -129,10 +129,6 @@ all:
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\resource
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\richedit
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
!endif
cd $(WXDIR)\samples\rotate cd $(WXDIR)\samples\rotate
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
@@ -167,8 +163,6 @@ all:
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\exec cd $(WXDIR)\samples\exec
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\richedit
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\statbar cd $(WXDIR)\samples\statbar
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL) make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\sockets cd $(WXDIR)\samples\sockets
@@ -269,8 +263,6 @@ clean:
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\resource
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\richedit
make -f makefile.b32 clean
cd $(WXDIR)\samples\rotate cd $(WXDIR)\samples\rotate
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
@@ -309,8 +301,6 @@ clean:
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\statbar cd $(WXDIR)\samples\statbar
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\richedit
make -f makefile.b32 clean
cd $(WXDIR)\samples\propsize cd $(WXDIR)\samples\propsize
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\sockets cd $(WXDIR)\samples\sockets

4
samples/makefile.dos
View File

@@ -125,8 +125,6 @@ all:
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\resource
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!if "$(NOMAKE)"=="" !if "$(NOMAKE)"==""
cd $(WXDIR)\samples\richedit
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif !endif
@@ -250,8 +248,6 @@ clean:
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\resource
nmake -f makefile.dos clean nmake -f makefile.dos clean
!if "$(NOMAKE)"=="" !if "$(NOMAKE)"==""
cd $(WXDIR)\samples\richedit
nmake -f makefile.dos clean
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos clean nmake -f makefile.dos clean
!endif !endif

1
samples/makefile.g95
View File

@@ -69,7 +69,6 @@ all clean:
-$(MAKE) -C propsize $(CMDLINE) $@ -$(MAKE) -C propsize $(CMDLINE) $@
-$(MAKE) -C regtest $(CMDLINE) $@ -$(MAKE) -C regtest $(CMDLINE) $@
-$(MAKE) -C resource $(CMDLINE) $@ -$(MAKE) -C resource $(CMDLINE) $@
-$(MAKE) -C richedit $(CMDLINE) $@
-$(MAKE) -C rotate $(CMDLINE) $@ -$(MAKE) -C rotate $(CMDLINE) $@
-$(MAKE) -C sashtest $(CMDLINE) $@ -$(MAKE) -C sashtest $(CMDLINE) $@
-$(MAKE) -C scroll $(CMDLINE) $@ -$(MAKE) -C scroll $(CMDLINE) $@

6
samples/makefile.vc
View File

@@ -126,10 +126,6 @@ all:
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\resource
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
!if "$(COMPIL)"==""
cd $(WXDIR)\samples\richedit
nmake -f makefile.vc $(MAKEFLAGS)
!endif
cd $(WXDIR)\samples\rotate cd $(WXDIR)\samples\rotate
nmake -f makefile.vc $(MAKEFLAGS) nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
@@ -246,8 +242,6 @@ clean:
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\resource cd $(WXDIR)\samples\resource
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\richedit
nmake -f makefile.vc clean
cd $(WXDIR)\samples\rotate cd $(WXDIR)\samples\rotate
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest

12
samples/samples.dsw
View File

@@ -675,18 +675,6 @@ Package=<4>
############################################################################### ###############################################################################
Project: "richedit"=.\richedit\richedit.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "rotate"=.\rotate\rotate.dsp - Package Owner=<4> Project: "rotate"=.\rotate\rotate.dsp - Package Owner=<4>
Package=<5> Package=<5>

33
src/common/docview.cpp
View File

@@ -594,7 +594,7 @@ bool wxView::Close(bool deleteWindow)
void wxView::Activate(bool activate) void wxView::Activate(bool activate)
{ {
if (GetDocumentManager()) if (GetDocument() && GetDocumentManager())
{ {
OnActivateView(activate, this, GetDocumentManager()->GetCurrentView()); OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
GetDocumentManager()->ActivateView(this, activate); GetDocumentManager()->ActivateView(this, activate);
@@ -1462,13 +1462,26 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
wxDocTemplate **data = new wxDocTemplate *[noTemplates]; wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i; int i;
int n = 0; int n = 0;
for (i = 0; i < noTemplates; i++) for (i = 0; i < noTemplates; i++)
{ {
if (templates[i]->IsVisible()) if (templates[i]->IsVisible())
{ {
strings.Add(templates[i]->m_description); int j;
if (!sort) bool want = TRUE;
for (j = 0; j < n; j++)
{ {
//filter out NOT unique documents + view combinations
if ( templates[i]->m_docTypeName == data[j]->m_docTypeName &&
templates[i]->m_viewTypeName == data[j]->m_viewTypeName
)
want = FALSE;
}
if ( want )
{
strings.Add(templates[i]->m_description);
data[n] = templates[i]; data[n] = templates[i];
n ++; n ++;
} }
@@ -1529,14 +1542,24 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
wxDocTemplate **data = new wxDocTemplate *[noTemplates]; wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i; int i;
int n = 0; int n = 0;
for (i = 0; i < noTemplates; i++) for (i = 0; i < noTemplates; i++)
{ {
wxDocTemplate *templ = templates[i]; wxDocTemplate *templ = templates[i];
if ( templ->IsVisible() && !templ->GetViewName().empty() ) if ( templ->IsVisible() && !templ->GetViewName().empty() )
{ {
strings.Add(templ->m_viewTypeName); int j;
if (!sort) bool want = TRUE;
for (j = 0; j < n; j++)
{ {
//filter out NOT unique views
if ( templates[i]->m_viewTypeName == data[j]->m_viewTypeName )
want = FALSE;
}
if ( want )
{
strings.Add(templ->m_viewTypeName);
data[n] = templ; data[n] = templ;
n ++; n ++;
} }