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

patch from Janos Vegh (2nd try, now it even compiles)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-05-10 16:19:09 +00:00
parent 32ac755d4a
commit caf0debf72
2 changed files with 410 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

363
include/wx/docview.h
View File

@@ -34,56 +34,55 @@ class WXDLLEXPORT wxPrintInfo;
class WXDLLEXPORT wxCommand; class WXDLLEXPORT wxCommand;
class WXDLLEXPORT wxCommandProcessor; class WXDLLEXPORT wxCommandProcessor;
class WXDLLEXPORT wxFileHistory; class WXDLLEXPORT wxFileHistory;
#if wxUSE_CONFIG
class WXDLLEXPORT wxConfigBase; class WXDLLEXPORT wxConfigBase;
#endif
#if wxUSE_IOSTREAMH #include "wx/ioswrap.h"
// N.B. BC++ doesn't have istream.h, ostream.h
# include <iostream.h>
#else
# include <istream>
# include <ostream>
# ifdef __VISUALC__
using namespace std;
# endif
#endif
// Document manager flags // Document manager flags
#define wxDOC_SDI 1 enum
#define wxDOC_MDI 2 {
#define wxDOC_NEW 4 wxDOC_SDI = 1,
#define wxDOC_SILENT 8 wxDOC_MDI,
#define wxDEFAULT_DOCMAN_FLAGS wxDOC_SDI wxDOC_NEW,
wxDOC_SILENT,
wxDEFAULT_DOCMAN_FLAGS = wxDOC_SDI
};
// Document template flags // Document template flags
#define wxTEMPLATE_VISIBLE 1 enum
#define wxTEMPLATE_INVISIBLE 2 {
#define wxDEFAULT_TEMPLATE_FLAGS wxTEMPLATE_VISIBLE wxTEMPLATE_VISIBLE = 1,
wxTEMPLATE_INVISIBLE,
wxDEFAULT_TEMPLATE_FLAGS = wxTEMPLATE_VISIBLE
};
#define wxMAX_FILE_HISTORY 9 #define wxMAX_FILE_HISTORY 9
class WXDLLEXPORT wxDocument : public wxEvtHandler class WXDLLEXPORT wxDocument : public wxEvtHandler
{ {
DECLARE_ABSTRACT_CLASS(wxDocument) DECLARE_ABSTRACT_CLASS(wxDocument)
public: public:
wxDocument(wxDocument *parent = (wxDocument *) NULL); wxDocument(wxDocument *parent = (wxDocument *) NULL);
~wxDocument(void); ~wxDocument();
// accessors
void SetFilename(const wxString& filename, bool notifyViews = FALSE); void SetFilename(const wxString& filename, bool notifyViews = FALSE);
inline wxString GetFilename(void) const { return m_documentFile; } wxString GetFilename() const { return m_documentFile; }
inline void SetTitle(const wxString& title) { m_documentTitle = title; };
inline wxString GetTitle(void) const { return m_documentTitle; }
inline void SetDocumentName(const wxString& name) { m_documentTypeName = name; };
inline wxString GetDocumentName(void) const { return m_documentTypeName; }
// Has the document been saved yet?
inline bool GetDocumentSaved(void) { return m_savedYet; }
inline void SetDocumentSaved(bool saved = TRUE) { m_savedYet = saved; }
virtual bool Close(void); void SetTitle(const wxString& title) { m_documentTitle = title; };
virtual bool Save(void); wxString GetTitle() const { return m_documentTitle; }
virtual bool SaveAs(void);
virtual bool Revert(void); void SetDocumentName(const wxString& name) { m_documentTypeName = name; };
wxString GetDocumentName() const { return m_documentTypeName; }
bool GetDocumentSaved() const { return m_savedYet; }
void SetDocumentSaved(bool saved = TRUE) { m_savedYet = saved; }
virtual bool Close();
virtual bool Save();
virtual bool SaveAs();
virtual bool Revert();
virtual ostream& SaveObject(ostream& stream); virtual ostream& SaveObject(ostream& stream);
virtual istream& LoadObject(istream& stream); virtual istream& LoadObject(istream& stream);
@@ -91,56 +90,56 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler
// Called by wxWindows // Called by wxWindows
virtual bool OnSaveDocument(const wxString& filename); virtual bool OnSaveDocument(const wxString& filename);
virtual bool OnOpenDocument(const wxString& filename); virtual bool OnOpenDocument(const wxString& filename);
virtual bool OnNewDocument(void); virtual bool OnNewDocument();
virtual bool OnCloseDocument(void); virtual bool OnCloseDocument();
// Prompts for saving if about to close a modified document. // Prompts for saving if about to close a modified document. Returns TRUE
// Returns TRUE if ok to close the document (may have saved in the // if ok to close the document (may have saved in the meantime, or set
// meantime, or set modified to FALSE) // modified to FALSE)
virtual bool OnSaveModified(void); virtual bool OnSaveModified();
// Called by framework if created automatically by the // Called by framework if created automatically by the default document
// default document manager: gives document a chance to // manager: gives document a chance to initialise and (usually) create a
// initialise and (usually) create a view // view
virtual bool OnCreate(const wxString& path, long flags); virtual bool OnCreate(const wxString& path, long flags);
// By default, creates a base wxCommandProcessor. // By default, creates a base wxCommandProcessor.
virtual wxCommandProcessor *OnCreateCommandProcessor(void); virtual wxCommandProcessor *OnCreateCommandProcessor();
virtual inline wxCommandProcessor *GetCommandProcessor(void) const { return m_commandProcessor; } virtual wxCommandProcessor *GetCommandProcessor() const { return m_commandProcessor; }
virtual inline void SetCommandProcessor(wxCommandProcessor *proc) { m_commandProcessor = proc; } virtual void SetCommandProcessor(wxCommandProcessor *proc) { m_commandProcessor = proc; }
// Called after a view is added or removed. // Called after a view is added or removed. The default implementation
// The default implementation deletes the document if this // deletes the document if this is there are no more views.
// is there are no more views. virtual void OnChangedViewList();
virtual void OnChangedViewList(void);
virtual bool DeleteContents(void); virtual bool DeleteContents();
virtual bool Draw(wxDC&); virtual bool Draw(wxDC&);
virtual inline bool IsModified(void) const { return m_documentModified; } virtual bool IsModified() const { return m_documentModified; }
virtual inline void Modify(bool mod) { m_documentModified = mod; } virtual void Modify(bool mod) { m_documentModified = mod; }
virtual bool AddView(wxView *view); virtual bool AddView(wxView *view);
virtual bool RemoveView(wxView *view); virtual bool RemoveView(wxView *view);
inline wxList& GetViews(void) const { return (wxList&) m_documentViews; } wxList& GetViews() const { return (wxList&) m_documentViews; }
wxView *GetFirstView(void) const; wxView *GetFirstView() const;
virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL); virtual void UpdateAllViews(wxView *sender = (wxView *) NULL, wxObject *hint = (wxObject *) NULL);
// Remove all views (because we're closing the document) // Remove all views (because we're closing the document)
virtual bool DeleteAllViews(void); virtual bool DeleteAllViews();
// Other stuff // Other stuff
virtual wxDocManager *GetDocumentManager(void) const; virtual wxDocManager *GetDocumentManager() const;
virtual inline wxDocTemplate *GetDocumentTemplate(void) const { return m_documentTemplate; } virtual wxDocTemplate *GetDocumentTemplate() const { return m_documentTemplate; }
virtual inline void SetDocumentTemplate(wxDocTemplate *temp) { m_documentTemplate = temp; } virtual void SetDocumentTemplate(wxDocTemplate *temp) { m_documentTemplate = temp; }
// Get title, or filename if no title, else [unnamed] // Get title, or filename if no title, else [unnamed]
virtual bool GetPrintableName(wxString& buf) const; virtual bool GetPrintableName(wxString& buf) const;
// Returns a window that can be used as a parent for document-related // Returns a window that can be used as a parent for document-related
// dialogs. Override if necessary. // dialogs. Override if necessary.
virtual wxWindow *GetDocumentWindow(void) const; virtual wxWindow *GetDocumentWindow() const;
protected: protected:
wxList m_documentViews; wxList m_documentViews;
wxString m_documentFile; wxString m_documentFile;
@@ -156,34 +155,34 @@ class WXDLLEXPORT wxDocument : public wxEvtHandler
class WXDLLEXPORT wxView: public wxEvtHandler class WXDLLEXPORT wxView: public wxEvtHandler
{ {
DECLARE_ABSTRACT_CLASS(wxView) DECLARE_ABSTRACT_CLASS(wxView)
public: public:
// wxView(wxDocument *doc = (wxDocument *) NULL); // wxView(wxDocument *doc = (wxDocument *) NULL);
wxView(); wxView();
~wxView(void); ~wxView();
inline wxDocument *GetDocument(void) const { return m_viewDocument; } wxDocument *GetDocument() const { return m_viewDocument; }
void SetDocument(wxDocument *doc); void SetDocument(wxDocument *doc);
inline wxString GetViewName(void) 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; };
inline wxFrame *GetFrame(void) const { return m_viewFrame ; } wxFrame *GetFrame() const { return m_viewFrame ; }
inline void SetFrame(wxFrame *frame) { m_viewFrame = frame; } void SetFrame(wxFrame *frame) { m_viewFrame = frame; }
virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView); virtual void OnActivateView(bool activate, wxView *activeView, wxView *deactiveView);
virtual void OnDraw(wxDC *dc) = 0; virtual void OnDraw(wxDC *dc) = 0;
virtual void OnPrint(wxDC *dc, wxObject *info); virtual void OnPrint(wxDC *dc, wxObject *info);
virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL); virtual void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
virtual void OnChangeFilename(void); virtual void OnChangeFilename();
// Called by framework if created automatically by the // Called by framework if created automatically by the default document
// default document manager class: gives view a chance to // manager class: gives view a chance to initialise
// initialise
virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return TRUE; }; virtual bool OnCreate(wxDocument *WXUNUSED(doc), long WXUNUSED(flags)) { return TRUE; };
// Checks if the view is the last one for the document; if so, // Checks if the view is the last one for the document; if so, asks user
// asks user to confirm save data (if modified). If ok, // to confirm save data (if modified). If ok, deletes itself and returns
// deletes itself and returns TRUE. // TRUE.
virtual bool Close(bool deleteWindow = TRUE); virtual bool Close(bool deleteWindow = TRUE);
// Override to do cleanup/veto close // Override to do cleanup/veto close
@@ -191,7 +190,7 @@ class WXDLLEXPORT wxView: public wxEvtHandler
#if WXWIN_COMPATIBILITY #if WXWIN_COMPATIBILITY
// Defeat compiler warning // Defeat compiler warning
bool OnClose(void) { return wxEvtHandler::OnClose(); } bool OnClose() { return wxEvtHandler::OnClose(); }
#endif #endif
// Extend event processing to search the document's event table // Extend event processing to search the document's event table
@@ -201,11 +200,11 @@ class WXDLLEXPORT wxView: public wxEvtHandler
// The function then notifies the document manager. // The function then notifies the document manager.
virtual void Activate(bool activate); virtual void Activate(bool activate);
wxDocManager *GetDocumentManager(void) const wxDocManager *GetDocumentManager() const
{ return m_viewDocument->GetDocumentManager(); } { return m_viewDocument->GetDocumentManager(); }
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
virtual wxPrintout *OnCreatePrintout(void); virtual wxPrintout *OnCreatePrintout();
#endif #endif
protected: protected:
@@ -222,40 +221,46 @@ class WXDLLEXPORT wxDocTemplate: public wxObject
friend class WXDLLEXPORT wxDocManager; friend class WXDLLEXPORT wxDocManager;
public: public:
// Associate document and view types. They're for identifying what view is
// Associate document and view types. // associated with what template/document type
// They're for identifying what view is associated with what wxDocTemplate(wxDocManager *manager,
// template/document type const wxString& descr,
wxDocTemplate(wxDocManager *manager, const wxString& descr, const wxString& filter, const wxString& dir, const wxString& filter,
const wxString& ext, const wxString& docTypeName, const wxString& viewTypeName, const wxString& dir,
wxClassInfo *docClassInfo = (wxClassInfo *) NULL, wxClassInfo *viewClassInfo = (wxClassInfo *)NULL, const wxString& ext,
const wxString& docTypeName,
const wxString& viewTypeName,
wxClassInfo *docClassInfo = (wxClassInfo *) NULL,
wxClassInfo *viewClassInfo = (wxClassInfo *)NULL,
long flags = wxDEFAULT_TEMPLATE_FLAGS); long flags = wxDEFAULT_TEMPLATE_FLAGS);
~wxDocTemplate(void); ~wxDocTemplate();
// By default, these two member functions dynamically creates document // By default, these two member functions dynamically creates document and
// and view using dynamic instance construction. // view using dynamic instance construction. Override these if you need a
// Override these if you need a different method of construction. // different method of construction.
virtual wxDocument *CreateDocument(const wxString& path, long flags = 0); virtual wxDocument *CreateDocument(const wxString& path, long flags = 0);
virtual wxView *CreateView(wxDocument *doc, long flags = 0); virtual wxView *CreateView(wxDocument *doc, long flags = 0);
inline wxString GetDefaultExtension(void) const { return m_defaultExt; }; wxString GetDefaultExtension() const { return m_defaultExt; };
inline wxString GetDescription(void) const { return m_description; } wxString GetDescription() const { return m_description; }
inline wxString GetDirectory(void) const { return m_directory; }; wxString GetDirectory() const { return m_directory; };
inline wxDocManager *GetDocumentManager(void) const { return m_documentManager; } wxDocManager *GetDocumentManager() const { return m_documentManager; }
inline void SetDocumentManager(wxDocManager *manager) { m_documentManager = manager; } void SetDocumentManager(wxDocManager *manager) { m_documentManager = manager; }
inline wxString GetFileFilter(void) const { return m_fileFilter; }; wxString GetFileFilter() const { return m_fileFilter; };
inline long GetFlags(void) const { return m_flags; }; long GetFlags() const { return m_flags; };
virtual wxString GetViewName(void) const { return m_viewTypeName; } virtual wxString GetViewName() const { return m_viewTypeName; }
virtual wxString GetDocumentName(void) const { return m_docTypeName; } virtual wxString GetDocumentName() const { return m_docTypeName; }
inline void SetFileFilter(const wxString& filter) { m_fileFilter = filter; }; void SetFileFilter(const wxString& filter) { m_fileFilter = filter; };
inline void SetDirectory(const wxString& dir) { m_directory = dir; }; void SetDirectory(const wxString& dir) { m_directory = dir; };
inline void SetDescription(const wxString& descr) { m_description = descr; }; void SetDescription(const wxString& descr) { m_description = descr; };
inline void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; }; void SetDefaultExtension(const wxString& ext) { m_defaultExt = ext; };
inline void SetFlags(long flags) { m_flags = flags; }; void SetFlags(long flags) { m_flags = flags; };
inline bool IsVisible(void) const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); } bool IsVisible() const { return ((m_flags & wxTEMPLATE_VISIBLE) == wxTEMPLATE_VISIBLE); }
virtual bool FileMatchesTemplate(const wxString& path);
protected: protected:
long m_flags; long m_flags;
@@ -270,23 +275,21 @@ class WXDLLEXPORT wxDocTemplate: public wxObject
// For dynamic creation of appropriate instances. // For dynamic creation of appropriate instances.
wxClassInfo* m_docClassInfo; wxClassInfo* m_docClassInfo;
wxClassInfo* m_viewClassInfo; wxClassInfo* m_viewClassInfo;
}; };
// One object of this class may be created in an application, // One object of this class may be created in an application, to manage all
// to manage all the templates and documents. // the templates and documents.
class WXDLLEXPORT wxDocManager: public wxEvtHandler class WXDLLEXPORT wxDocManager: public wxEvtHandler
{ {
DECLARE_DYNAMIC_CLASS(wxDocManager) DECLARE_DYNAMIC_CLASS(wxDocManager)
public: public:
wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE); wxDocManager(long flags = wxDEFAULT_DOCMAN_FLAGS, bool initialize = TRUE);
~wxDocManager(void); ~wxDocManager();
virtual bool Initialize(void); virtual bool Initialize();
// Handlers for common user commands // Handlers for common user commands
// virtual void OldOnMenuCommand(int command);
void OnFileClose(wxCommandEvent& event); void OnFileClose(wxCommandEvent& event);
void OnFileNew(wxCommandEvent& event); void OnFileNew(wxCommandEvent& event);
void OnFileOpen(wxCommandEvent& event); void OnFileOpen(wxCommandEvent& event);
@@ -318,10 +321,10 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
void AssociateTemplate(wxDocTemplate *temp); void AssociateTemplate(wxDocTemplate *temp);
void DisassociateTemplate(wxDocTemplate *temp); void DisassociateTemplate(wxDocTemplate *temp);
wxDocument *GetCurrentDocument(void) const; wxDocument *GetCurrentDocument() const;
inline void SetMaxDocsOpen(int n) { m_maxDocsOpen = n; } void SetMaxDocsOpen(int n) { m_maxDocsOpen = n; }
inline int GetMaxDocsOpen(void) const { return m_maxDocsOpen; } int GetMaxDocsOpen() const { return m_maxDocsOpen; }
// Add and remove a document from the manager's list // Add and remove a document from the manager's list
void AddDocument(wxDocument *doc); void AddDocument(wxDocument *doc);
@@ -333,28 +336,30 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
// Views or windows should inform the document manager // Views or windows should inform the document manager
// when a view is going in or out of focus // when a view is going in or out of focus
virtual void ActivateView(wxView *view, bool activate = TRUE, bool deleting = FALSE); virtual void ActivateView(wxView *view, bool activate = TRUE, bool deleting = FALSE);
virtual wxView *GetCurrentView(void) const; virtual wxView *GetCurrentView() const;
virtual inline wxList& GetDocuments(void) const { return (wxList&) m_docs; } virtual wxList& GetDocuments() const { return (wxList&) m_docs; }
// Make a default document name // Make a default document name
virtual bool MakeDefaultName(wxString& buf); virtual bool MakeDefaultName(wxString& buf);
virtual wxFileHistory *OnCreateFileHistory(void); virtual wxFileHistory *OnCreateFileHistory();
virtual inline wxFileHistory *GetFileHistory(void) const { return m_fileHistory; } virtual wxFileHistory *GetFileHistory() const { return m_fileHistory; }
// File history management // File history management
virtual void AddFileToHistory(const wxString& file); virtual void AddFileToHistory(const wxString& file);
virtual int GetNoHistoryFiles(void) const; virtual int GetNoHistoryFiles() const;
virtual wxString GetHistoryFile(int i) const; virtual wxString GetHistoryFile(int i) const;
virtual void FileHistoryUseMenu(wxMenu *menu); virtual void FileHistoryUseMenu(wxMenu *menu);
virtual void FileHistoryRemoveMenu(wxMenu *menu); virtual void FileHistoryRemoveMenu(wxMenu *menu);
#if wxUSE_CONFIG #if wxUSE_CONFIG
virtual void FileHistoryLoad(wxConfigBase& config); virtual void FileHistoryLoad(wxConfigBase& config);
virtual void FileHistorySave(wxConfigBase& config); virtual void FileHistorySave(wxConfigBase& config);
#endif #endif // wxUSE_CONFIG
virtual void FileHistoryAddFilesToMenu(); virtual void FileHistoryAddFilesToMenu();
virtual void FileHistoryAddFilesToMenu(wxMenu* menu); virtual void FileHistoryAddFilesToMenu(wxMenu* menu);
protected: protected:
long m_flags; long m_flags;
int m_defaultDocumentNameCounter; int m_defaultDocumentNameCounter;
@@ -367,19 +372,25 @@ class WXDLLEXPORT wxDocManager: public wxEvtHandler
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
/* // ----------------------------------------------------------------------------
* A default child frame // A default child frame
*/ // ----------------------------------------------------------------------------
class WXDLLEXPORT wxDocChildFrame : public wxFrame class WXDLLEXPORT wxDocChildFrame : public wxFrame
{ {
DECLARE_CLASS(wxDocChildFrame) DECLARE_CLASS(wxDocChildFrame)
public: public:
wxDocChildFrame(wxDocument *doc, wxView *view, wxFrame *frame, wxWindowID id, const wxString& title, wxDocChildFrame(wxDocument *doc,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, wxView *view,
long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"); wxFrame *frame,
~wxDocChildFrame(void); wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long type = wxDEFAULT_FRAME_STYLE,
const wxString& name = "frame");
~wxDocChildFrame();
// Extend event processing to search the view's event table // Extend event processing to search the view's event table
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event);
@@ -387,34 +398,40 @@ class WXDLLEXPORT wxDocChildFrame: public wxFrame
void OnActivate(wxActivateEvent& event); void OnActivate(wxActivateEvent& event);
void OnCloseWindow(wxCloseEvent& event); void OnCloseWindow(wxCloseEvent& event);
inline wxDocument *GetDocument(void) const { return m_childDocument; } wxDocument *GetDocument() const { return m_childDocument; }
inline wxView *GetView(void) const { return m_childView; } wxView *GetView() const { return m_childView; }
inline void SetDocument(wxDocument *doc) { m_childDocument = doc; } void SetDocument(wxDocument *doc) { m_childDocument = doc; }
inline void SetView(wxView *view) { m_childView = view; } void SetView(wxView *view) { m_childView = view; }
protected: protected:
wxDocument* m_childDocument; wxDocument* m_childDocument;
wxView* m_childView; wxView* m_childView;
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
/* // ----------------------------------------------------------------------------
* A default parent frame // A default parent frame
*/ // ----------------------------------------------------------------------------
class WXDLLEXPORT wxDocParentFrame : public wxFrame class WXDLLEXPORT wxDocParentFrame : public wxFrame
{ {
DECLARE_CLASS(wxDocParentFrame) DECLARE_CLASS(wxDocParentFrame)
public: public:
wxDocParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, wxDocParentFrame(wxDocManager *manager,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, wxFrame *frame,
long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame"); wxWindowID id,
const wxString& title,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long type = wxDEFAULT_FRAME_STYLE,
const wxString& name = "frame");
// Extend event processing to search the document manager's event table // Extend event processing to search the document manager's event table
virtual bool ProcessEvent(wxEvent& event); virtual bool ProcessEvent(wxEvent& event);
wxDocManager *GetDocumentManager(void) const { return m_docManager; } wxDocManager *GetDocumentManager() const { return m_docManager; }
void OnExit(wxCommandEvent& event); void OnExit(wxCommandEvent& event);
void OnMRUFile(wxCommandEvent& event); void OnMRUFile(wxCommandEvent& event);
@@ -426,14 +443,15 @@ class WXDLLEXPORT wxDocParentFrame: public wxFrame
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
/* // ----------------------------------------------------------------------------
* Provide simple default printing facilities // Provide simple default printing facilities
*/ // ----------------------------------------------------------------------------
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE
class WXDLLEXPORT wxDocPrintout : public wxPrintout class WXDLLEXPORT wxDocPrintout : public wxPrintout
{ {
DECLARE_DYNAMIC_CLASS(wxDocPrintout) DECLARE_DYNAMIC_CLASS(wxDocPrintout)
public: public:
wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = "Printout"); wxDocPrintout(wxView *view = (wxView *) NULL, const wxString& title = "Printout");
bool OnPrintPage(int page); bool OnPrintPage(int page);
@@ -441,31 +459,34 @@ class WXDLLEXPORT wxDocPrintout: public wxPrintout
bool OnBeginDocument(int startPage, int endPage); bool OnBeginDocument(int startPage, int endPage);
void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo); void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
virtual inline wxView *GetView(void) { return m_printoutView; } virtual wxView *GetView() { return m_printoutView; }
protected: protected:
wxView* m_printoutView; wxView* m_printoutView;
}; };
#endif #endif // wxUSE_PRINTING_ARCHITECTURE
/* // ----------------------------------------------------------------------------
* Command processing framework // Command processing framework
*/ // ----------------------------------------------------------------------------
class WXDLLEXPORT wxCommand : public wxObject class WXDLLEXPORT wxCommand : public wxObject
{ {
DECLARE_CLASS(wxCommand) DECLARE_CLASS(wxCommand)
public: public:
wxCommand(bool canUndoIt = FALSE, const wxString& name = ""); wxCommand(bool canUndoIt = FALSE, const wxString& name = "");
~wxCommand(void); ~wxCommand();
// Override this to perform a command // Override this to perform a command
virtual bool Do(void) = 0; virtual bool Do() = 0;
// Override this to undo a command // Override this to undo a command
virtual bool Undo(void) = 0; virtual bool Undo() = 0;
virtual bool CanUndo() const { return m_canUndo; }
virtual wxString GetName() const { return m_commandName; }
virtual inline bool CanUndo(void) const { return m_canUndo; }
virtual inline wxString GetName(void) const { return m_commandName; }
protected: protected:
bool m_canUndo; bool m_canUndo;
wxString m_commandName; wxString m_commandName;
@@ -474,28 +495,28 @@ class WXDLLEXPORT wxCommand: public wxObject
class WXDLLEXPORT wxCommandProcessor : public wxObject class WXDLLEXPORT wxCommandProcessor : public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxCommandProcessor) DECLARE_DYNAMIC_CLASS(wxCommandProcessor)
public: public:
wxCommandProcessor(int maxCommands = 100); wxCommandProcessor(int maxCommands = 100);
~wxCommandProcessor(void); ~wxCommandProcessor();
// Pass a command to the processor. The processor calls Do(); // Pass a command to the processor. The processor calls Do(); if
// if successful, is appended to the command history unless // successful, is appended to the command history unless storeIt is FALSE.
// storeIt is FALSE.
virtual bool Submit(wxCommand *command, bool storeIt = TRUE); virtual bool Submit(wxCommand *command, bool storeIt = TRUE);
virtual bool Undo(void); virtual bool Undo();
virtual bool Redo(void); virtual bool Redo();
virtual bool CanUndo(void) const; virtual bool CanUndo() const;
virtual bool CanRedo(void) const; virtual bool CanRedo() const;
// Call this to manage an edit menu. // Call this to manage an edit menu.
inline void SetEditMenu(wxMenu *menu) { m_commandEditMenu = menu; } void SetEditMenu(wxMenu *menu) { m_commandEditMenu = menu; }
inline wxMenu *GetEditMenu(void) const { return m_commandEditMenu; } wxMenu *GetEditMenu() const { return m_commandEditMenu; }
virtual void SetMenuStrings(void); virtual void SetMenuStrings();
virtual void Initialize(void); virtual void Initialize();
inline wxList& GetCommands(void) const { return (wxList&) m_commands; } wxList& GetCommands() const { return (wxList&) m_commands; }
inline int GetMaxCommands(void) const { return m_maxNoCommands; } int GetMaxCommands() const { return m_maxNoCommands; }
virtual void ClearCommands(void); virtual void ClearCommands();
protected: protected:
int m_maxNoCommands; int m_maxNoCommands;
@@ -504,18 +525,21 @@ class WXDLLEXPORT wxCommandProcessor: public wxObject
wxMenu* m_commandEditMenu; wxMenu* m_commandEditMenu;
}; };
// ----------------------------------------------------------------------------
// File history management // File history management
// ----------------------------------------------------------------------------
class WXDLLEXPORT wxFileHistory : public wxObject class WXDLLEXPORT wxFileHistory : public wxObject
{ {
DECLARE_DYNAMIC_CLASS(wxFileHistory) DECLARE_DYNAMIC_CLASS(wxFileHistory)
public: public:
wxFileHistory(int maxFiles = 9); wxFileHistory(int maxFiles = 9);
~wxFileHistory(void); ~wxFileHistory();
// Operations // Operations
virtual void AddFileToHistory(const wxString& file); virtual void AddFileToHistory(const wxString& file);
virtual int GetMaxFiles(void) const { return m_fileMaxFiles; } virtual int GetMaxFiles() const { return m_fileMaxFiles; }
virtual void UseMenu(wxMenu *menu); virtual void UseMenu(wxMenu *menu);
// Remove menu from the list (MDI child may be closing) // Remove menu from the list (MDI child may be closing)
@@ -524,7 +548,7 @@ class WXDLLEXPORT wxFileHistory: public wxObject
#if wxUSE_CONFIG #if wxUSE_CONFIG
virtual void Load(wxConfigBase& config); virtual void Load(wxConfigBase& config);
virtual void Save(wxConfigBase& config); virtual void Save(wxConfigBase& config);
#endif #endif // wxUSE_CONFIG
virtual void AddFilesToMenu(); virtual void AddFilesToMenu();
virtual void AddFilesToMenu(wxMenu* menu); // Single menu virtual void AddFilesToMenu(wxMenu* menu); // Single menu
@@ -534,9 +558,9 @@ class WXDLLEXPORT wxFileHistory: public wxObject
// A synonym for GetNoHistoryFiles // A synonym for GetNoHistoryFiles
virtual int GetCount() const { return m_fileHistoryN; } virtual int GetCount() const { return m_fileHistoryN; }
inline int GetNoHistoryFiles(void) const { return m_fileHistoryN; } int GetNoHistoryFiles() const { return m_fileHistoryN; }
inline wxList& GetMenus() const { return (wxList&) m_fileMenus; } wxList& GetMenus() const { return (wxList&) m_fileMenus; }
protected: protected:
// Last n files // Last n files
@@ -554,5 +578,4 @@ class WXDLLEXPORT wxFileHistory: public wxObject
bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, ostream& stream); bool WXDLLEXPORT wxTransferFileToStream(const wxString& filename, ostream& stream);
bool WXDLLEXPORT wxTransferStreamToFile(istream& stream, const wxString& filename); bool WXDLLEXPORT wxTransferStreamToFile(istream& stream, const wxString& filename);
#endif // _WX_DOCH__
#endif

7
src/common/docview.cpp
View File

@@ -1183,9 +1183,12 @@ wxDocTemplate *wxDocManager::SelectDocumentPath(wxDocTemplate **templates,
int FilterIndex = 0; int FilterIndex = 0;
wxString pathTmp = wxFileSelectorEx(_("Select a file"), wxString pathTmp = wxFileSelectorEx(_("Select a file"),
_T(""), _T(""), _T(""), _T(""),
_T(""),
&FilterIndex, &FilterIndex,
descrBuf, 0, wxTheApp->GetTopWindow()); descrBuf,
0,
wxTheApp->GetTopWindow());
if (!pathTmp.IsEmpty()) if (!pathTmp.IsEmpty())
{ {