renamed wxWave to wxSound

[wxWidgets.git] / include / wx / stc / stc.h

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index b02b934ccec84d974d76eaf5fc24086ffe898dbc..f70374ee2fc851cf7da04ce2e4f41933380ccddb 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -24,7 +24,7 @@
 #include <wx/wx.h>
 #include <wx/dnd.h>
 
 #include <wx/wx.h>
 #include <wx/dnd.h>
 

-#ifndef SWIG
+

 #ifdef WXMAKINGDLL_STC
     #define WXDLLIMPEXP_STC WXEXPORT
 #elif defined(WXUSINGDLL)
 #ifdef WXMAKINGDLL_STC
     #define WXDLLIMPEXP_STC WXEXPORT
 #elif defined(WXUSINGDLL)


@@ -32,7 +32,6 @@
 #else // not making nor using DLL
     #define WXDLLIMPEXP_STC
 #endif
 #else // not making nor using DLL
     #define WXDLLIMPEXP_STC
 #endif

-#endif // SWIG

 
 
 // SWIG can't handle "#if" type of conditionals, only "#ifdef"
 
 
 // SWIG can't handle "#if" type of conditionals, only "#ifdef"


@@ -1141,31 +1140,34 @@ class  WXDLLIMPEXP_STC wxStyledTextEvent;
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#ifndef SWIG

 class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {
 class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl {

-#else
-class wxStyledTextCtrl : public wxControl {
-#endif

 public:
 
 #ifdef SWIG
 public:
 
 #ifdef SWIG

+    %pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
+    %pythonAppend wxStyledTextCtrl() ""
+

     wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxPySTCNameStr);
     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);
 #else
     wxStyledTextCtrl(wxWindow *parent, wxWindowID id,
                      const wxPoint& pos = wxDefaultPosition,
                      const wxSize& size = wxDefaultSize, long style = 0,
                      const wxString& name = wxSTCNameStr);

+    wxStyledTextCtrl() { m_swx = NULL; }
+    ~wxStyledTextCtrl();
+    

 #endif
 
 #endif
 

+    void Create(wxWindow *parent, wxWindowID id,
+                     const wxPoint& pos = wxDefaultPosition,
+                     const wxSize& size = wxDefaultSize, long style = 0,
+                     const wxString& name = wxSTCNameStr);

 
 

-#ifndef SWIG
-    ~wxStyledTextCtrl();
-#endif

 
 //----------------------------------------------------------------------
 // BEGIN generated section.  The following code is automatically generated
 
 //----------------------------------------------------------------------
 // BEGIN generated section.  The following code is automatically generated


@@ -2344,11 +2346,7 @@ protected:
 
 //----------------------------------------------------------------------
 
 
 //----------------------------------------------------------------------
 

-#ifndef SWIG

 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {

-#else
-class wxStyledTextEvent : public wxCommandEvent {
-#endif

 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
 #ifndef SWIG
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
 #ifndef SWIG