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

Merge branch 'aui-docview'

Browse Source 
Make it possible to easily use AUI classes instead of the standard MDI
docview frames.

Also fix a few old and dirty hacks in AUI code.

See https://github.com/wxWidgets/wxWidgets/pull/808
This commit is contained in:
Vadim Zeitlin
2018-06-10 14:53:39 +02:00
parent ce903da798 4710302aec
commit 64fc4dc6cd
14 changed files with 184 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
include/wx/aui/tabmdi.h
View File

@@ -11,7 +11,7 @@
#ifndef _WX_AUITABMDI_H_ #ifndef _WX_AUITABMDI_H_
#define _WX_AUITABMDI_H_ #define _WX_AUITABMDI_H_
#if wxUSE_AUI #if wxUSE_AUI && wxUSE_MDI
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// headers // headers
@@ -21,6 +21,7 @@
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/notebook.h" #include "wx/notebook.h"
#include "wx/icon.h" #include "wx/icon.h"
#include "wx/mdi.h"
#include "wx/aui/auibook.h" #include "wx/aui/auibook.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -115,7 +116,7 @@ private:
// wxAuiMDIChildFrame // wxAuiMDIChildFrame
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_AUI wxAuiMDIChildFrame : public wxPanel class WXDLLIMPEXP_AUI wxAuiMDIChildFrame : public wxTDIChildFrame
{ {
public: public:
wxAuiMDIChildFrame(); wxAuiMDIChildFrame();
@@ -137,88 +138,35 @@ public:
const wxString& name = wxFrameNameStr); const wxString& name = wxFrameNameStr);
#if wxUSE_MENUS #if wxUSE_MENUS
virtual void SetMenuBar(wxMenuBar *menuBar); virtual void SetMenuBar(wxMenuBar *menuBar) wxOVERRIDE;
virtual wxMenuBar *GetMenuBar() const; virtual wxMenuBar *GetMenuBar() const wxOVERRIDE;
#endif // wxUSE_MENUS #endif // wxUSE_MENUS
virtual void SetTitle(const wxString& title); virtual void SetTitle(const wxString& title) wxOVERRIDE;
virtual wxString GetTitle() const;
virtual void SetIcons(const wxIconBundle& icons); virtual void SetIcons(const wxIconBundle& icons) wxOVERRIDE;
virtual const wxIconBundle& GetIcons() const;
virtual void SetIcon(const wxIcon& icon); virtual void Activate() wxOVERRIDE;
virtual const wxIcon& GetIcon() const;
virtual void Activate();
virtual bool Destroy() wxOVERRIDE; virtual bool Destroy() wxOVERRIDE;
virtual bool Show(bool show = true) wxOVERRIDE; virtual bool Show(bool show = true) wxOVERRIDE;
#if wxUSE_STATUSBAR
// no status bars
virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1,
long WXUNUSED(style) = 1,
wxWindowID WXUNUSED(winid) = 1,
const wxString& WXUNUSED(name) = wxEmptyString)
{ return NULL; }
virtual wxStatusBar *GetStatusBar() const { return NULL; }
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
#endif
#if wxUSE_TOOLBAR
// no toolbar bars
virtual wxToolBar* CreateToolBar(long WXUNUSED(style),
wxWindowID WXUNUSED(winid),
const wxString& WXUNUSED(name))
{ return NULL; }
virtual wxToolBar *GetToolBar() const { return NULL; }
#endif
// no maximize etc
virtual void Maximize(bool WXUNUSED(maximize) = true) { /* Has no effect */ }
virtual void Restore() { /* Has no effect */ }
virtual void Iconize(bool WXUNUSED(iconize) = true) { /* Has no effect */ }
virtual bool IsMaximized() const { return true; }
virtual bool IsIconized() const { return false; }
virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; }
virtual bool IsFullScreen() const { return false; }
virtual bool IsTopLevel() const wxOVERRIDE { return false; }
void OnMenuHighlight(wxMenuEvent& evt); void OnMenuHighlight(wxMenuEvent& evt);
void OnActivate(wxActivateEvent& evt);
void OnCloseWindow(wxCloseEvent& evt);
void SetMDIParentFrame(wxAuiMDIParentFrame* parent); void SetMDIParentFrame(wxAuiMDIParentFrame* parent);
wxAuiMDIParentFrame* GetMDIParentFrame() const; wxAuiMDIParentFrame* GetMDIParentFrame() const;
protected: protected:
void Init(); void Init();
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags) wxOVERRIDE;
virtual void DoMoveWindow(int x, int y, int width, int height) wxOVERRIDE;
// no size hints
virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
int WXUNUSED(maxW), int WXUNUSED(maxH),
int WXUNUSED(incW), int WXUNUSED(incH)) wxOVERRIDE {}
public: public:
// This function needs to be called when a size change is confirmed, // This function needs to be called when a size change is confirmed,
// we needed this function to prevent anybody from the outside // we needed this function to prevent anybody from the outside
// changing the panel... it messes the UI layout when we would allow it. // changing the panel... it messes the UI layout when we would allow it.
void ApplyMDIChildFrameRect(); void ApplyMDIChildFrameRect();
void DoShow(bool show);
protected: protected:
wxAuiMDIParentFrame* m_pMDIParentFrame; wxAuiMDIParentFrame* m_pMDIParentFrame;
wxRect m_mdiNewRect;
wxRect m_mdiCurRect;
wxString m_title;
wxIcon m_icon;
wxIconBundle m_iconBundle;
bool m_activateOnCreate; bool m_activateOnCreate;
#if wxUSE_MENUS #if wxUSE_MENUS
@@ -247,7 +195,6 @@ public:
virtual bool CreateClient(wxAuiMDIParentFrame *parent, virtual bool CreateClient(wxAuiMDIParentFrame *parent,
long style = wxVSCROLL | wxHSCROLL); long style = wxVSCROLL | wxHSCROLL);
virtual int SetSelection(size_t page) wxOVERRIDE;
virtual wxAuiMDIChildFrame* GetActiveChild(); virtual wxAuiMDIChildFrame* GetActiveChild();
virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame) virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame)
{ {
@@ -259,12 +206,11 @@ protected:
void PageChanged(int oldSelection, int newSelection); void PageChanged(int oldSelection, int newSelection);
void OnPageClose(wxAuiNotebookEvent& evt); void OnPageClose(wxAuiNotebookEvent& evt);
void OnPageChanged(wxAuiNotebookEvent& evt); void OnPageChanged(wxAuiNotebookEvent& evt);
void OnSize(wxSizeEvent& evt);
private: private:
wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow); wxDECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow);
wxDECLARE_EVENT_TABLE(); wxDECLARE_EVENT_TABLE();
}; };
#endif // wxUSE_AUI #endif // wxUSE_AUI && wxUSE_MDI
#endif // _WX_AUITABMDI_H_ #endif // _WX_AUITABMDI_H_

5
samples/docview/Makefile.in
View File

@@ -98,6 +98,9 @@ COND_PLATFORM_OS2_1___docview___os2_emxbindcmd = $(NM) docview$(EXEEXT) | if \
@COND_TOOLKIT_OSX_IPHONE@ = $(__docview_app_Contents_PkgInfo___depname) @COND_TOOLKIT_OSX_IPHONE@ = $(__docview_app_Contents_PkgInfo___depname)
@COND_TOOLKIT_COCOA@____docview_BUNDLE_TGT_REF_DEP = \ @COND_TOOLKIT_COCOA@____docview_BUNDLE_TGT_REF_DEP = \
@COND_TOOLKIT_COCOA@ $(__docview_app_Contents_PkgInfo___depname) @COND_TOOLKIT_COCOA@ $(__docview_app_Contents_PkgInfo___depname)
COND_MONOLITHIC_0___WXLIB_AUI_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_AUI_p = $(COND_MONOLITHIC_0___WXLIB_AUI_p)
COND_MONOLITHIC_0___WXLIB_CORE_p = \ COND_MONOLITHIC_0___WXLIB_CORE_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -148,7 +151,7 @@ distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc) docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
$(CXX) -o $@ $(DOCVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS) $(CXX) -o $@ $(DOCVIEW_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
$(__docview___os2_emxbindcmd) $(__docview___os2_emxbindcmd)
@COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/doc.icns $(srcdir)/chart.icns $(srcdir)/notepad.icns @COND_PLATFORM_MACOSX_1@docview.app/Contents/PkgInfo: docview$(EXEEXT) $(srcdir)/Info.plist.in $(srcdir)/doc.icns $(srcdir)/chart.icns $(srcdir)/notepad.icns

1
samples/docview/docview.bkl
View File

@@ -10,6 +10,7 @@
<exe id="docview" template="wx_sample" template_append="wx_append"> <exe id="docview" template="wx_sample" template_append="wx_append">
<sources>docview.cpp doc.cpp view.cpp</sources> <sources>docview.cpp doc.cpp view.cpp</sources>
<headers>docview.h doc.h view.h</headers> <headers>docview.h doc.h view.h</headers>
<wx-lib>aui</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<win32-res>docview.rc</win32-res> <win32-res>docview.rc</win32-res>

86
samples/docview/docview.cpp
View File

@@ -49,6 +49,10 @@
#include "wx/docview.h" #include "wx/docview.h"
#include "wx/docmdi.h" #include "wx/docmdi.h"
#if wxUSE_AUI
#include "wx/aui/tabmdi.h"
#endif // wxUSE_AUI
#include "docview.h" #include "docview.h"
#include "doc.h" #include "doc.h"
#include "view.h" #include "view.h"
@@ -92,7 +96,12 @@ MyApp::MyApp()
namespace CmdLineOption namespace CmdLineOption
{ {
#if wxUSE_MDI_ARCHITECTURE
const char * const MDI = "mdi"; const char * const MDI = "mdi";
#endif // wxUSE_MDI_ARCHITECTURE
#if wxUSE_AUI
const char * const AUI = "aui";
#endif // wxUSE_AUI
const char * const SDI = "sdi"; const char * const SDI = "sdi";
const char * const SINGLE = "single"; const char * const SINGLE = "single";
@@ -102,8 +111,14 @@ void MyApp::OnInitCmdLine(wxCmdLineParser& parser)
{ {
wxApp::OnInitCmdLine(parser); wxApp::OnInitCmdLine(parser);
#if wxUSE_MDI_ARCHITECTURE
parser.AddSwitch("", CmdLineOption::MDI, parser.AddSwitch("", CmdLineOption::MDI,
"run in MDI mode: multiple documents, single window"); "run in MDI mode: multiple documents, single window");
#endif // wxUSE_MDI_ARCHITECTURE
#if wxUSE_AUI
parser.AddSwitch("", CmdLineOption::AUI,
"run in MDI mode using AUI: multiple documents, single window");
#endif // wxUSE_AUI
parser.AddSwitch("", CmdLineOption::SDI, parser.AddSwitch("", CmdLineOption::SDI,
"run in SDI mode: multiple documents, multiple windows"); "run in SDI mode: multiple documents, multiple windows");
parser.AddSwitch("", CmdLineOption::SINGLE, parser.AddSwitch("", CmdLineOption::SINGLE,
@@ -126,6 +141,14 @@ bool MyApp::OnCmdLineParsed(wxCmdLineParser& parser)
} }
#endif // wxUSE_MDI_ARCHITECTURE #endif // wxUSE_MDI_ARCHITECTURE
#if wxUSE_AUI
if ( parser.Found(CmdLineOption::AUI) )
{
m_mode = Mode_AUI;
numModeOptions++;
}
#endif // wxUSE_AUI
if ( parser.Found(CmdLineOption::SDI) ) if ( parser.Found(CmdLineOption::SDI) )
{ {
m_mode = Mode_SDI; m_mode = Mode_SDI;
@@ -198,22 +221,37 @@ bool MyApp::OnInit()
} }
// create the main frame window // create the main frame window
wxFrame *frame; wxFrame *frame = NULL;
#if wxUSE_MDI_ARCHITECTURE switch ( m_mode )
if ( m_mode == Mode_MDI )
{ {
#if wxUSE_MDI_ARCHITECTURE
case Mode_MDI:
frame = new wxDocMDIParentFrame(docManager, NULL, wxID_ANY, frame = new wxDocMDIParentFrame(docManager, NULL, wxID_ANY,
GetAppDisplayName(), GetAppDisplayName(),
wxDefaultPosition, wxDefaultPosition,
wxSize(500, 400)); wxSize(500, 400));
} break;
else
#endif // wxUSE_MDI_ARCHITECTURE #endif // wxUSE_MDI_ARCHITECTURE
{
#if wxUSE_AUI
case Mode_AUI:
frame = new wxDocParentFrameAny<wxAuiMDIParentFrame>
(
docManager, NULL, wxID_ANY,
GetAppDisplayName(),
wxDefaultPosition,
wxSize(500, 400)
);
break;
#endif // wxUSE_AUI
case Mode_SDI:
case Mode_Single:
frame = new wxDocParentFrame(docManager, NULL, wxID_ANY, frame = new wxDocParentFrame(docManager, NULL, wxID_ANY,
GetAppDisplayName(), GetAppDisplayName(),
wxDefaultPosition, wxDefaultPosition,
wxSize(500, 400)); wxSize(500, 400));
break;
} }
// and its menu bar // and its menu bar
@@ -317,11 +355,12 @@ void MyApp::CreateMenuBarForFrame(wxFrame *frame, wxMenu *file, wxMenu *edit)
wxFrame *MyApp::CreateChildFrame(wxView *view, bool isCanvas) wxFrame *MyApp::CreateChildFrame(wxView *view, bool isCanvas)
{ {
// create a child frame of appropriate class for the current mode // create a child frame of appropriate class for the current mode
wxFrame *subframe; wxFrame *subframe = NULL;
wxDocument *doc = view->GetDocument(); wxDocument *doc = view->GetDocument();
switch ( GetMode() )
#if wxUSE_MDI_ARCHITECTURE #if wxUSE_MDI_ARCHITECTURE
if ( GetMode() == Mode_MDI )
{ {
case Mode_MDI:
subframe = new wxDocMDIChildFrame subframe = new wxDocMDIChildFrame
( (
doc, doc,
@@ -332,10 +371,26 @@ wxFrame *MyApp::CreateChildFrame(wxView *view, bool isCanvas)
wxDefaultPosition, wxDefaultPosition,
wxSize(300, 300) wxSize(300, 300)
); );
} break;
else
#endif // wxUSE_MDI_ARCHITECTURE #endif // wxUSE_MDI_ARCHITECTURE
{
#if wxUSE_AUI
case Mode_AUI:
subframe = new wxDocChildFrameAny<wxAuiMDIChildFrame, wxAuiMDIParentFrame>
(
doc,
view,
wxStaticCast(GetTopWindow(), wxAuiMDIParentFrame),
wxID_ANY,
"Child Frame",
wxDefaultPosition,
wxSize(300, 300)
);
break;
#endif // wxUSE_AUI
case Mode_SDI:
case Mode_Single:
subframe = new wxDocChildFrame subframe = new wxDocChildFrame
( (
doc, doc,
@@ -348,6 +403,7 @@ wxFrame *MyApp::CreateChildFrame(wxView *view, bool isCanvas)
); );
subframe->Centre(); subframe->Centre();
break;
} }
wxMenu *menuFile = new wxMenu; wxMenu *menuFile = new wxMenu;
@@ -392,6 +448,12 @@ void MyApp::OnAbout(wxCommandEvent& WXUNUSED(event))
break; break;
#endif // wxUSE_MDI_ARCHITECTURE #endif // wxUSE_MDI_ARCHITECTURE
#if wxUSE_AUI
case Mode_AUI:
modeName = "AUI";
break;
#endif // wxUSE_AUI
case Mode_SDI: case Mode_SDI:
modeName = "SDI"; modeName = "SDI";
break; break;
@@ -415,7 +477,7 @@ void MyApp::OnAbout(wxCommandEvent& WXUNUSED(event))
"\n" "\n"
"Authors: Julian Smart, Vadim Zeitlin\n" "Authors: Julian Smart, Vadim Zeitlin\n"
"\n" "\n"
"Usage: docview [--{mdi,sdi,single}]", "Usage: docview [--{mdi,aui,sdi,single}]",
modeName, modeName,
docsCount docsCount
); );

3
samples/docview/docview.h
View File

@@ -27,6 +27,9 @@ public:
#if wxUSE_MDI_ARCHITECTURE #if wxUSE_MDI_ARCHITECTURE
Mode_MDI, // MDI mode: multiple documents, single top level window Mode_MDI, // MDI mode: multiple documents, single top level window
#endif // wxUSE_MDI_ARCHITECTURE #endif // wxUSE_MDI_ARCHITECTURE
#if wxUSE_AUI
Mode_AUI, // MDI AUI mode
#endif // wxUSE_AUI
Mode_SDI, // SDI mode: multiple documents, multiple top level windows Mode_SDI, // SDI mode: multiple documents, multiple top level windows
Mode_Single // single document mode (and hence single top level window) Mode_Single // single document mode (and hence single top level window)
}; };

8
samples/docview/docview_vc7.vcproj
View File

@@ -46,7 +46,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\docview.exe" OutputFile="vc_mswud\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@@ -108,7 +108,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\docview.exe" OutputFile="vc_mswu\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@@ -175,7 +175,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\docview.exe" OutputFile="vc_mswuddll\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@@ -237,7 +237,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\docview.exe" OutputFile="vc_mswudll\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"

16
samples/docview/docview_vc8.vcproj
View File

@@ -83,7 +83,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\docview.exe" OutputFile="vc_mswud\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -177,7 +177,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\docview.exe" OutputFile="vc_mswu\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -276,7 +276,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\docview.exe" OutputFile="vc_mswuddll\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -370,7 +370,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\docview.exe" OutputFile="vc_mswudll\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -469,7 +469,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\docview.exe" OutputFile="vc_mswud_x64\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -563,7 +563,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\docview.exe" OutputFile="vc_mswu_x64\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -662,7 +662,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\docview.exe" OutputFile="vc_mswuddll_x64\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -756,7 +756,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\docview.exe" OutputFile="vc_mswudll_x64\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"

16
samples/docview/docview_vc9.vcproj
View File

@@ -82,7 +82,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud\docview.exe" OutputFile="vc_mswud\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -173,7 +173,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu\docview.exe" OutputFile="vc_mswu\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -268,7 +268,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll\docview.exe" OutputFile="vc_mswuddll\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -359,7 +359,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll\docview.exe" OutputFile="vc_mswudll\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -454,7 +454,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswud_x64\docview.exe" OutputFile="vc_mswud_x64\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -545,7 +545,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswu_x64\docview.exe" OutputFile="vc_mswu_x64\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -640,7 +640,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31ud_aui.lib wxmsw31ud_core.lib wxbase31ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswuddll_x64\docview.exe" OutputFile="vc_mswuddll_x64\docview.exe"
LinkIncremental="2" LinkIncremental="2"
SuppressStartupBanner="true" SuppressStartupBanner="true"
@@ -731,7 +731,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="" AdditionalOptions=""
AdditionalDependencies="wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib" AdditionalDependencies="wxmsw31u_aui.lib wxmsw31u_core.lib wxbase31u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib"
OutputFile="vc_mswudll_x64\docview.exe" OutputFile="vc_mswudll_x64\docview.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="true" SuppressStartupBanner="true"

6
samples/docview/makefile.bcc
View File

@@ -166,6 +166,10 @@ __DLLFLAG_p = -DWXUSINGDLL
__DLLFLAG_p_1 = -dWXUSINGDLL __DLLFLAG_p_1 = -dWXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_AUI_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
!endif !endif
@@ -230,7 +234,7 @@ clean:
$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&| ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__WXLIB_AUI_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib uxtheme.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res
| |
$(OBJS)\docview_docview.obj: .\docview.cpp $(OBJS)\docview_docview.obj: .\docview.cpp

6
samples/docview/makefile.gcc
View File

@@ -151,6 +151,10 @@ ifeq ($(SHARED),1)
__DLLFLAG_p_1 = --define WXUSINGDLL __DLLFLAG_p_1 = --define WXUSINGDLL
endif endif
ifeq ($(MONOLITHIC),0) ifeq ($(MONOLITHIC),0)
__WXLIB_AUI_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui
endif
ifeq ($(MONOLITHIC),0)
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
endif endif
@@ -220,7 +224,7 @@ clean:
-if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview_rc.o
$(CXX) -o $@ $(DOCVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_AUI_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lshlwapi -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lversion -lwsock32 -lwininet -loleacc -luxtheme
$(OBJS)\docview_docview.o: ./docview.cpp $(OBJS)\docview_docview.o: ./docview.cpp
$(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<

2
samples/docview/makefile.unx
View File

@@ -90,7 +90,7 @@ test_for_selected_wxbuild:
@$(WX_CONFIG) $(WX_CONFIG_FLAGS) @$(WX_CONFIG) $(WX_CONFIG_FLAGS)
docview: $(DOCVIEW_OBJECTS) docview: $(DOCVIEW_OBJECTS)
$(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs core,base` $(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) `$(WX_CONFIG) $(WX_CONFIG_FLAGS) --libs aui,core,base`
docview_docview.o: ./docview.cpp docview_docview.o: ./docview.cpp
$(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(DOCVIEW_CXXFLAGS) $(CPPDEPS) $<

6
samples/docview/makefile.vc
View File

@@ -304,6 +304,10 @@ __DLLFLAG_p = /DWXUSINGDLL
__DLLFLAG_p_1 = /d WXUSINGDLL __DLLFLAG_p_1 = /d WXUSINGDLL
!endif !endif
!if "$(MONOLITHIC)" == "0" !if "$(MONOLITHIC)" == "0"
__WXLIB_AUI_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib
!endif
!if "$(MONOLITHIC)" == "0"
__WXLIB_CORE_p = \ __WXLIB_CORE_p = \
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
!endif !endif
@@ -353,7 +357,7 @@ clean:
$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res $(OBJS)\docview.exe: $(DOCVIEW_OBJECTS) $(OBJS)\docview_docview.res
link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<< link /NOLOGO /OUT:$@ $(__DEBUGINFO_1) /pdb:"$(OBJS)\docview.pdb" $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @<<
$(DOCVIEW_OBJECTS) $(DOCVIEW_RESOURCES) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib $(DOCVIEW_OBJECTS) $(DOCVIEW_RESOURCES) $(__WXLIB_AUI_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib shlwapi.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib version.lib wsock32.lib wininet.lib
<< <<
$(OBJS)\docview_docview.obj: .\docview.cpp $(OBJS)\docview_docview.obj: .\docview.cpp

15
src/aui/auibook.cpp
View File

@@ -930,7 +930,7 @@ static void ShowWnd(wxWindow* wnd, bool show)
if (wxDynamicCast(wnd, wxAuiMDIChildFrame)) if (wxDynamicCast(wnd, wxAuiMDIChildFrame))
{ {
wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd; wxAuiMDIChildFrame* cf = (wxAuiMDIChildFrame*)wnd;
cf->DoShow(show); cf->wxWindow::Show(show);
} }
else else
#endif #endif
@@ -1595,14 +1595,6 @@ public:
} }
// TODO: else if (GetFlags() & wxAUI_NB_LEFT){} // TODO: else if (GetFlags() & wxAUI_NB_LEFT){}
// TODO: else if (GetFlags() & wxAUI_NB_RIGHT){} // TODO: else if (GetFlags() & wxAUI_NB_RIGHT){}
#if wxUSE_MDI
if (wxDynamicCast(page.window, wxAuiMDIChildFrame))
{
wxAuiMDIChildFrame* wnd = (wxAuiMDIChildFrame*)page.window;
wnd->ApplyMDIChildFrameRect();
}
#endif
} }
} }
@@ -1981,8 +1973,11 @@ bool wxAuiNotebook::InsertPage(size_t page_idx,
else else
active_tabctrl->InsertPage(page, info, page_idx); active_tabctrl->InsertPage(page, info, page_idx);
UpdateTabCtrlHeight(); // Note that we don't need to call DoSizing() if the height has changed, as
// it's already called from UpdateTabCtrlHeight() itself in this case.
if ( !UpdateTabCtrlHeight() )
DoSizing(); DoSizing();
active_tabctrl->DoShowHide(); active_tabctrl->DoShowHide();
// adjust selected index // adjust selected index

127
src/aui/tabmdi.cpp
View File

@@ -423,12 +423,10 @@ void wxAuiMDIParentFrame::Tile(wxOrientation orient)
// wxAuiMDIChildFrame // wxAuiMDIChildFrame
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIChildFrame, wxPanel); wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIChildFrame, wxFrame);
wxBEGIN_EVENT_TABLE(wxAuiMDIChildFrame, wxPanel) wxBEGIN_EVENT_TABLE(wxAuiMDIChildFrame, wxFrame)
EVT_MENU_HIGHLIGHT_ALL(wxAuiMDIChildFrame::OnMenuHighlight) EVT_MENU_HIGHLIGHT_ALL(wxAuiMDIChildFrame::OnMenuHighlight)
EVT_ACTIVATE(wxAuiMDIChildFrame::OnActivate)
EVT_CLOSE(wxAuiMDIChildFrame::OnCloseWindow)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
wxAuiMDIChildFrame::wxAuiMDIChildFrame() wxAuiMDIChildFrame::wxAuiMDIChildFrame()
@@ -498,17 +496,14 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
if (style & wxMINIMIZE) if (style & wxMINIMIZE)
m_activateOnCreate = false; m_activateOnCreate = false;
wxSize cli_size = pClientWindow->GetClientSize(); // create the window hidden to prevent flicker
wxWindow::Show(false);
// create the window off-screen to prevent flicker wxWindow::Create(pClientWindow,
wxPanel::Create(pClientWindow,
id, id,
wxPoint(cli_size.x+1, cli_size.y+1), wxDefaultPosition,
size, size,
wxNO_BORDER, name); wxNO_BORDER, name);
DoShow(false);
SetMDIParentFrame(parent); SetMDIParentFrame(parent);
m_title = title; m_title = title;
@@ -609,32 +604,17 @@ void wxAuiMDIChildFrame::SetTitle(const wxString& title)
} }
} }
wxString wxAuiMDIChildFrame::GetTitle() const
{
return m_title;
}
void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons) void wxAuiMDIChildFrame::SetIcons(const wxIconBundle& icons)
{ {
// get icon with the system icon size wxTDIChildFrame::SetIcons(icons);
SetIcon(icons.GetIcon(-1));
m_iconBundle = icons;
}
const wxIconBundle& wxAuiMDIChildFrame::GetIcons() const
{
return m_iconBundle;
}
void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
{
wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame")); wxASSERT_MSG(pParentFrame, wxT("Missing MDI Parent Frame"));
m_icon = icon; const wxSize sizeIcon(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
wxBitmap bmp; wxBitmap bmp;
bmp.CopyFromIcon(m_icon); bmp.CopyFromIcon(icons.GetIcon(sizeIcon));
wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow(); wxAuiMDIClientWindow* pClientWindow = pParentFrame->GetClientWindow();
if (pClientWindow != NULL) if (pClientWindow != NULL)
@@ -648,12 +628,6 @@ void wxAuiMDIChildFrame::SetIcon(const wxIcon& icon)
} }
} }
const wxIcon& wxAuiMDIChildFrame::GetIcon() const
{
return m_icon;
}
void wxAuiMDIChildFrame::Activate() void wxAuiMDIChildFrame::Activate()
{ {
wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame(); wxAuiMDIParentFrame* pParentFrame = GetMDIParentFrame();
@@ -689,16 +663,6 @@ void wxAuiMDIChildFrame::OnMenuHighlight(wxMenuEvent& event)
#endif // wxUSE_STATUSBAR #endif // wxUSE_STATUSBAR
} }
void wxAuiMDIChildFrame::OnActivate(wxActivateEvent& WXUNUSED(event))
{
// do nothing
}
void wxAuiMDIChildFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
Destroy();
}
void wxAuiMDIChildFrame::SetMDIParentFrame(wxAuiMDIParentFrame* parentFrame) void wxAuiMDIChildFrame::SetMDIParentFrame(wxAuiMDIParentFrame* parentFrame)
{ {
m_pMDIParentFrame = parentFrame; m_pMDIParentFrame = parentFrame;
@@ -720,51 +684,23 @@ void wxAuiMDIChildFrame::Init()
bool wxAuiMDIChildFrame::Show(bool show) bool wxAuiMDIChildFrame::Show(bool show)
{ {
// wxAuiMDIChildFrame uses m_activateOnCreate only to decide whether to
// activate the frame when it is created. After Create() is called,
// m_activateOnCreate will never be read again. Therefore, calling this
// function after Create() is pointless and you probably want to call
// Activate() instead.
wxCHECK_MSG( !GetHandle(), false,
wxS("Show() has no effect after Create(). Do you mean Activate()?") );
m_activateOnCreate = show; m_activateOnCreate = show;
// do nothing if ( show )
{
// This is not a real TLW, so it won't get a size event when it's
// really "mapped", i.e. appears on the screen for the first time.
// Instead, its size had been already set when it was created and we
// didn't have any opportunity to lay it out since then, i.e. since
// before its children were created. Do it now to allow the same code
// that would work with a "real" wxMDIChildFrame to also work with this
// class.
DoLayout();
}
return true; return true;
} }
void wxAuiMDIChildFrame::DoShow(bool show)
{
wxWindow::Show(show);
}
void wxAuiMDIChildFrame::DoSetSize(int x, int y, int width, int height, int sizeFlags)
{
m_mdiNewRect = wxRect(x, y, width, height);
#ifdef __WXGTK__
wxPanel::DoSetSize(x,y,width, height, sizeFlags);
#else
wxUnusedVar(sizeFlags);
#endif
}
void wxAuiMDIChildFrame::DoMoveWindow(int x, int y, int width, int height)
{
m_mdiNewRect = wxRect(x, y, width, height);
}
void wxAuiMDIChildFrame::ApplyMDIChildFrameRect()
{
if (m_mdiCurRect != m_mdiNewRect)
{
wxPanel::DoMoveWindow(m_mdiNewRect.x, m_mdiNewRect.y,
m_mdiNewRect.width, m_mdiNewRect.height);
m_mdiCurRect = m_mdiNewRect;
}
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// wxAuiMDIClientWindow // wxAuiMDIClientWindow
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@@ -774,7 +710,6 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxAuiMDIClientWindow, wxAuiNotebook);
wxBEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook) wxBEGIN_EVENT_TABLE(wxAuiMDIClientWindow, wxAuiNotebook)
EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged) EVT_AUINOTEBOOK_PAGE_CHANGED(wxID_ANY, wxAuiMDIClientWindow::OnPageChanged)
EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, wxAuiMDIClientWindow::OnPageClose) EVT_AUINOTEBOOK_PAGE_CLOSE(wxID_ANY, wxAuiMDIClientWindow::OnPageClose)
EVT_SIZE(wxAuiMDIClientWindow::OnSize)
wxEND_EVENT_TABLE() wxEND_EVENT_TABLE()
wxAuiMDIClientWindow::wxAuiMDIClientWindow() wxAuiMDIClientWindow::wxAuiMDIClientWindow()
@@ -790,11 +725,6 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
{ {
SetWindowStyleFlag(style); SetWindowStyleFlag(style);
wxSize caption_icon_size =
wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X),
wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
SetUniformBitmapSize(caption_icon_size);
if (!wxAuiNotebook::Create(parent, if (!wxAuiNotebook::Create(parent,
wxID_ANY, wxID_ANY,
wxPoint(0,0), wxPoint(0,0),
@@ -812,11 +742,6 @@ bool wxAuiMDIClientWindow::CreateClient(wxAuiMDIParentFrame* parent, long style)
return true; return true;
} }
int wxAuiMDIClientWindow::SetSelection(size_t nPage)
{
return wxAuiNotebook::SetSelection(nPage);
}
wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild() wxAuiMDIChildFrame* wxAuiMDIClientWindow::GetActiveChild()
{ {
const int sel = GetSelection(); const int sel = GetSelection();
@@ -891,13 +816,5 @@ void wxAuiMDIClientWindow::OnPageChanged(wxAuiNotebookEvent& evt)
PageChanged(evt.GetOldSelection(), evt.GetSelection()); PageChanged(evt.GetOldSelection(), evt.GetSelection());
} }
void wxAuiMDIClientWindow::OnSize(wxSizeEvent& evt)
{
wxAuiNotebook::OnSize(evt);
for (size_t pos = 0; pos < GetPageCount(); pos++)
((wxAuiMDIChildFrame *)GetPage(pos))->ApplyMDIChildFrameRect();
}
#endif //wxUSE_AUI #endif //wxUSE_AUI
#endif // wxUSE_MDI #endif // wxUSE_MDI