Changes needed to be able to build with SWIG 1.3.24, 1.3.27 as well as
the upcoming 1.3.28, using #if statements on SWIG_VERSION. Adjustments to ownership of SWIG objects, add some destructors and explicitly disown non-window objects when their ownership is transfered to a C++ object. Since all window objects are owned by their parent, or by themselves, always set their thisown attribute to False. Explicitly set thisown to False after any Destroy() methods are called, so SWIG doesn't try to destroy them again. Etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1255,7 +1255,10 @@ public:
|
||||
|
||||
wxHtmlHelpData* GetData();
|
||||
wxHtmlHelpController* GetController() const;
|
||||
|
||||
%disownarg( wxHtmlHelpController* controller );
|
||||
void SetController(wxHtmlHelpController* controller);
|
||||
%cleardisown( wxHtmlHelpController* controller );
|
||||
|
||||
// Displays page x. If not found it will offect the user a choice of
|
||||
// searching books.
|
||||
@@ -1360,7 +1363,9 @@ public:
|
||||
wxHtmlHelpController* GetController() const;
|
||||
|
||||
/// Sets the help controller associated with the window.
|
||||
%disownarg( wxHtmlHelpController* controller );
|
||||
void SetController(wxHtmlHelpController* controller);
|
||||
%cleardisown( wxHtmlHelpController* controller );
|
||||
|
||||
/// Returns the help window.
|
||||
wxHtmlHelpWindow* GetHelpWindow() const;
|
||||
@@ -1417,7 +1422,9 @@ public:
|
||||
wxHtmlHelpController* GetController() const;
|
||||
|
||||
/// Sets the controller associated with this dialog.
|
||||
%disownarg( wxHtmlHelpController* controller );
|
||||
void SetController(wxHtmlHelpController* controller);
|
||||
%cleardisown( wxHtmlHelpController* controller );
|
||||
|
||||
/// Returns the help window.
|
||||
wxHtmlHelpWindow* GetHelpWindow() const;
|
||||
@@ -1533,8 +1540,6 @@ public:
|
||||
|
||||
void MakeModalIfNeeded();
|
||||
wxWindow* FindTopLevelWindow();
|
||||
|
||||
%pythoncode { def Destroy(self): pass }
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user