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

Patch #826420, and also adapted to new SWIG

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-10-31 01:12:25 +00:00
parent 727953356d
commit 39c0acb666
8 changed files with 140 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/include/wx/stc/stc.h
View File

@@ -24,7 +24,7 @@
#include <wx/wx.h>
#include <wx/dnd.h>
#ifndef SWIG
#ifdef WXMAKINGDLL_STC
#define WXDLLIMPEXP_STC WXEXPORT
#elif defined(WXUSINGDLL)
@@ -32,7 +32,6 @@
#else // not making nor using DLL
#define WXDLLIMPEXP_STC
#endif
#endif // SWIG
// SWIG can't handle "#if" type of conditionals, only "#ifdef"
@@ -1141,32 +1140,35 @@ class WXDLLIMPEXP_STC wxStyledTextEvent;
//----------------------------------------------------------------------
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
#else
class wxStyledTextCtrl : public wxControl {
#endif
public:
#ifdef SWIG
%addtofunc wxStyledTextCtrl "self._setOORInfo(self)"
%addtofunc wxStyledTextCtrl() ""
wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxPySTCNameStr);
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
%name(PreStyledTextCtrl) wxStyledTextCtrl();
#else
wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxSTCNameStr);
#endif
#ifndef SWIG
wxStyledTextCtrl() { m_swx = NULL; }
~wxStyledTextCtrl();
#endif
void Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, long style = 0,
const wxString& name = wxSTCNameStr);
//----------------------------------------------------------------------
// BEGIN generated section. The following code is automatically generated
// by gen_iface.py. Do not edit this file. Edit stc.h.in instead
@@ -2344,11 +2346,7 @@ protected:
//----------------------------------------------------------------------
#ifndef SWIG
class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
#else
class wxStyledTextEvent : public wxCommandEvent {
#endif
public:
wxStyledTextEvent(wxEventType commandType=0, int id=0);
#ifndef SWIG