projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't call IAutoComplete::Init() twice for the same control as this leaks memory...
[wxWidgets.git]
/
include
/
wx
/
docview.h
diff --git
a/include/wx/docview.h
b/include/wx/docview.h
index d3e109eb60544e7a771af5d28775e32def68bdad..b8bb1f31c9a4a20498acd6018dd5bb93e7a15961 100644
(file)
--- a/
include/wx/docview.h
+++ b/
include/wx/docview.h
@@
-521,7
+521,12
@@
class WXDLLIMPEXP_CORE wxDocChildFrameAnyBase
{
public:
// default ctor, use Create() after it
{
public:
// default ctor, use Create() after it
- wxDocChildFrameAnyBase() { m_win = NULL; }
+ wxDocChildFrameAnyBase()
+ {
+ m_childDocument = NULL;
+ m_childView = NULL;
+ m_win = NULL;
+ }
// full ctor equivalent to using the default one and Create(0
wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win)
// full ctor equivalent to using the default one and Create(0
wxDocChildFrameAnyBase(wxDocument *doc, wxView *view, wxWindow *win)
@@
-631,10
+636,10
@@
public:
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
long style = wxDEFAULT_FRAME_STYLE,
const wxString& name = wxFrameNameStr)
{
- if ( !
BaseClass::Create(parent, id, title, pos, size, style, name
) )
+ if ( !
wxDocChildFrameAnyBase::Create(doc, view, this
) )
return false;
return false;
- if ( !
wxDocChildFrameAnyBase::Create(doc, view, this
) )
+ if ( !
BaseClass::Create(parent, id, title, pos, size, style, name
) )
return false;
this->Connect(wxEVT_ACTIVATE,
return false;
this->Connect(wxEVT_ACTIVATE,
@@
-690,6
+695,7
@@
private:
// for dll-interface class 'wxDocChildFrame'" -- this is bogus as the
// template will be DLL-exported but only once it is used as base class
// here!
// for dll-interface class 'wxDocChildFrame'" -- this is bogus as the
// template will be DLL-exported but only once it is used as base class
// here!
+ #pragma warning (push)
#pragma warning (disable:4275)
#endif
#pragma warning (disable:4275)
#endif
@@
-739,7
+745,7
@@
private:
};
#ifdef __VISUALC6__
};
#ifdef __VISUALC6__
- #pragma warning (
default:4275
)
+ #pragma warning (
pop
)
#endif
// ----------------------------------------------------------------------------
#endif
// ----------------------------------------------------------------------------