From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 12 Apr 2002 13:15:44 +0000 (+0000)
Subject: Applied docview patch
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bb28b47763782647dcc1bec72786c16f39c48d35
Applied docview patch
Removed richedit sample compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 6733ed6ffa..6f0f70ccf0 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -913,21 +913,6 @@ samples/resource/*.xpm
samples/resource/*.ico
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/*.h
samples/rotate/makefile*
diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index c8e87e849c..70d630299b 100644
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -26,7 +26,6 @@ samples/help/Makefile.in
samples/internat/Makefile.in
samples/ipc/Makefile.in
samples/png/Makefile.in
-samples/richedit/Makefile.in
samples/resource/Makefile.in
samples/sockets/Makefile.in
samples/html/Makefile.in
diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 56dc955443..5ab98b753c 100644
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -182,9 +182,6 @@ samples/regtest/regtest.dsw
samples/resource/resource.dsp
samples/resource/resource.dsw
-samples/richedit/richedit.dsp
-samples/richedit/richedit.dsw
-
samples/rotate/rotate.dsp
samples/rotate/rotate.dsw
diff --git a/include/wx/docview.h b/include/wx/docview.h
index 4cd975e70c..52f0c25048 100644
--- a/include/wx/docview.h
+++ b/include/wx/docview.h
@@ -171,7 +171,7 @@ public:
~wxView();
wxDocument *GetDocument() const { return m_viewDocument; }
- void SetDocument(wxDocument *doc);
+ virtual void SetDocument(wxDocument *doc);
wxString GetViewName() const { return m_viewTypeName; }
void SetViewName(const wxString& name) { m_viewTypeName = name; };
diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 59d6e3de90..b8d23c5edd 100644
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -71,7 +71,7 @@ public:
// what kind of menu item we are
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
{ return m_kind == wxITEM_CHECK || m_kind == wxITEM_RADIO; }
diff --git a/samples/makefile.b32 b/samples/makefile.b32
index 7c4613cc8f..de856f954e 100644
--- a/samples/makefile.b32
+++ b/samples/makefile.b32
@@ -129,10 +129,6 @@ all:
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\resource
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
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\sashtest
@@ -167,8 +163,6 @@ all:
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\exec
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
- cd $(WXDIR)\samples\richedit
- make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\statbar
make -f makefile.b32 FINAL=$(FINAL) WXUSINGDLL=$(WXUSINGDLL)
cd $(WXDIR)\samples\sockets
@@ -269,8 +263,6 @@ clean:
make -f makefile.b32 clean
cd $(WXDIR)\samples\resource
make -f makefile.b32 clean
- cd $(WXDIR)\samples\richedit
- make -f makefile.b32 clean
cd $(WXDIR)\samples\rotate
make -f makefile.b32 clean
cd $(WXDIR)\samples\sashtest
@@ -309,8 +301,6 @@ clean:
make -f makefile.b32 clean
cd $(WXDIR)\samples\statbar
make -f makefile.b32 clean
- cd $(WXDIR)\samples\richedit
- make -f makefile.b32 clean
cd $(WXDIR)\samples\propsize
make -f makefile.b32 clean
cd $(WXDIR)\samples\sockets
diff --git a/samples/makefile.dos b/samples/makefile.dos
index 6644d39300..4d51c78f8c 100644
--- a/samples/makefile.dos
+++ b/samples/makefile.dos
@@ -125,8 +125,6 @@ all:
cd $(WXDIR)\samples\resource
nmake -f makefile.dos FINAL=$(FINAL)
!if "$(NOMAKE)"==""
- cd $(WXDIR)\samples\richedit
- nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos FINAL=$(FINAL)
!endif
@@ -250,8 +248,6 @@ clean:
cd $(WXDIR)\samples\resource
nmake -f makefile.dos clean
!if "$(NOMAKE)"==""
- cd $(WXDIR)\samples\richedit
- nmake -f makefile.dos clean
cd $(WXDIR)\samples\sashtest
nmake -f makefile.dos clean
!endif
diff --git a/samples/makefile.g95 b/samples/makefile.g95
index 55f17bb06d..8bd8c65b77 100644
--- a/samples/makefile.g95
+++ b/samples/makefile.g95
@@ -69,7 +69,6 @@ all clean:
-$(MAKE) -C propsize $(CMDLINE) $@
-$(MAKE) -C regtest $(CMDLINE) $@
-$(MAKE) -C resource $(CMDLINE) $@
- -$(MAKE) -C richedit $(CMDLINE) $@
-$(MAKE) -C rotate $(CMDLINE) $@
-$(MAKE) -C sashtest $(CMDLINE) $@
-$(MAKE) -C scroll $(CMDLINE) $@
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 39a5b243fe..ba8f85ced5 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -126,10 +126,6 @@ all:
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\resource
nmake -f makefile.vc $(MAKEFLAGS)
-!if "$(COMPIL)"==""
- cd $(WXDIR)\samples\richedit
- nmake -f makefile.vc $(MAKEFLAGS)
-!endif
cd $(WXDIR)\samples\rotate
nmake -f makefile.vc $(MAKEFLAGS)
cd $(WXDIR)\samples\sashtest
@@ -246,8 +242,6 @@ clean:
nmake -f makefile.vc clean
cd $(WXDIR)\samples\resource
nmake -f makefile.vc clean
- cd $(WXDIR)\samples\richedit
- nmake -f makefile.vc clean
cd $(WXDIR)\samples\rotate
nmake -f makefile.vc clean
cd $(WXDIR)\samples\sashtest
diff --git a/samples/samples.dsw b/samples/samples.dsw
index 88a2c4219d..db1ce4aff3 100644
--- a/samples/samples.dsw
+++ b/samples/samples.dsw
@@ -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>
Package=<5>
diff --git a/src/common/docview.cpp b/src/common/docview.cpp
index 2cdab5312d..c368a8ee52 100644
--- a/src/common/docview.cpp
+++ b/src/common/docview.cpp
@@ -594,7 +594,7 @@ bool wxView::Close(bool deleteWindow)
void wxView::Activate(bool activate)
{
- if (GetDocumentManager())
+ if (GetDocument() && GetDocumentManager())
{
OnActivateView(activate, this, GetDocumentManager()->GetCurrentView());
GetDocumentManager()->ActivateView(this, activate);
@@ -1462,13 +1462,26 @@ wxDocTemplate *wxDocManager::SelectDocumentType(wxDocTemplate **templates,
wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i;
int n = 0;
+
for (i = 0; i < noTemplates; i++)
{
if (templates[i]->IsVisible())
{
- strings.Add(templates[i]->m_description);
- if (!sort)
+ int j;
+ 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];
n ++;
}
@@ -1529,14 +1542,24 @@ wxDocTemplate *wxDocManager::SelectViewType(wxDocTemplate **templates,
wxDocTemplate **data = new wxDocTemplate *[noTemplates];
int i;
int n = 0;
+
for (i = 0; i < noTemplates; i++)
{
wxDocTemplate *templ = templates[i];
if ( templ->IsVisible() && !templ->GetViewName().empty() )
{
- strings.Add(templ->m_viewTypeName);
- if (!sort)
+ int j;
+ 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;
n ++;
}