projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slightly better style?
[wxWidgets.git]
/
include
/
wx
/
docview.h
diff --git
a/include/wx/docview.h
b/include/wx/docview.h
index ba1b413a12808bfcb516a46b5c4c956320adb869..7c42886d13da30f1ae62bb956399fee8237447b7 100644
(file)
--- a/
include/wx/docview.h
+++ b/
include/wx/docview.h
@@
-6,7
+6,7
@@
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c)
// Created: 01/02/97
// RCS-ID: $Id$
// Copyright: (c)
-// Licence: wxWindows licence
+// Licence:
wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DOCH__
/////////////////////////////////////////////////////////////////////////////
#ifndef _WX_DOCH__
@@
-44,7
+44,7
@@
class WXDLLEXPORT wxConfigBase;
#else
# include <istream>
# include <ostream>
#else
# include <istream>
# include <ostream>
-# ifdef _
MSC_VER
+# ifdef _
_VISUALC__
using namespace std;
# endif
#endif
using namespace std;
# endif
#endif
@@
-157,7
+157,8
@@
class WXDLLEXPORT wxView: public wxEvtHandler
{
DECLARE_ABSTRACT_CLASS(wxView)
public:
{
DECLARE_ABSTRACT_CLASS(wxView)
public:
- wxView(wxDocument *doc = (wxDocument *) NULL);
+// wxView(wxDocument *doc = (wxDocument *) NULL);
+ wxView();
~wxView(void);
inline wxDocument *GetDocument(void) const { return m_viewDocument; }
~wxView(void);
inline wxDocument *GetDocument(void) const { return m_viewDocument; }
@@
-187,8
+188,11
@@
class WXDLLEXPORT wxView: public wxEvtHandler
// Override to do cleanup/veto close
virtual bool OnClose(bool deleteWindow);
// Override to do cleanup/veto close
virtual bool OnClose(bool deleteWindow);
+
+#if WXWIN_COMPATIBILITY
// Defeat compiler warning
// Defeat compiler warning
- inline bool OnClose(void) { return wxEvtHandler::OnClose(); }
+ bool OnClose(void) { return wxEvtHandler::OnClose(); }
+#endif
// Extend event processing to search the document's event table
virtual bool ProcessEvent(wxEvent& event);
// Extend event processing to search the document's event table
virtual bool ProcessEvent(wxEvent& event);
@@
-197,7
+201,8
@@
class WXDLLEXPORT wxView: public wxEvtHandler
// The function then notifies the document manager.
virtual void Activate(bool activate);
// The function then notifies the document manager.
virtual void Activate(bool activate);
- inline wxDocManager *GetDocumentManager(void) const { return m_viewDocument->GetDocumentManager(); }
+ wxDocManager *GetDocumentManager(void) const
+ { return m_viewDocument->GetDocumentManager(); }
#if wxUSE_PRINTING_ARCHITECTURE
virtual wxPrintout *OnCreatePrintout(void);
#if wxUSE_PRINTING_ARCHITECTURE
virtual wxPrintout *OnCreatePrintout(void);
@@
-535,7
+540,7
@@
class WXDLLEXPORT wxFileHistory: public wxObject
protected:
// Last n files
protected:
// Last n files
-
char**
m_fileHistory;
+
wxChar**
m_fileHistory;
// Number of files saved
int m_fileHistoryN;
// Menus to maintain (may need several for an MDI app)
// Number of files saved
int m_fileHistoryN;
// Menus to maintain (may need several for an MDI app)