A little clarification

[wxWidgets.git] / src / stc / stc.h.in

diff --git a/src/stc/stc.h.in b/src/stc/stc.h.in
index 5adb5df385203a3b682b9926888eb0897f834b70..514357984a9868d959c6e897128aae1f979223d2 100644 (file)
--- a/src/stc/stc.h.in
+++ b/src/stc/stc.h.in
@@ -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,9 +32,17 @@
 #else // not making nor using DLL
     #define WXDLLIMPEXP_STC
 #endif
-#endif // SWIG
 
 
+// SWIG can't handle "#if" type of conditionals, only "#ifdef"
+#ifdef SWIG
+#define STC_USE_DND 1
+#else
+#if wxUSE_DRAG_AND_DROP
+#define STC_USE_DND 1
+#endif
+#endif
+
 //----------------------------------------------------------------------
 
 // Should a wxPopupWindow be used for the call tips and autocomplete windows?
@@ -71,31 +79,34 @@ 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);
+    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);
 
-#ifndef SWIG
-    ~wxStyledTextCtrl();
-#endif
 
 //----------------------------------------------------------------------
 // BEGIN generated section.  The following code is automatically generated
@@ -191,6 +202,15 @@ public:
     // Load the contents of filename into the editor
     bool LoadFile(const wxString& filename);
 
+#ifdef STC_USE_DND
+    // Allow for simulating a DnD DragOver
+    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def); 
+
+    // Allow for simulating a DnD DropText
+    bool DoDropText(long x, long y, const wxString& data);
+#endif
+
+
 
 //----------------------------------------------------------------------
 
@@ -242,20 +262,7 @@ protected:
 
 //----------------------------------------------------------------------
 
-// SWIG can't handle "#if" type of conditionals, only "#ifdef"
-#ifdef SWIG
-#define STC_USE_DND 1
-#else
-#if wxUSE_DRAG_AND_DROP
-#define STC_USE_DND 1
-#endif
-#endif
-
-#ifndef SWIG
 class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
-#else
-class wxStyledTextEvent : public wxCommandEvent {
-#endif
 public:
     wxStyledTextEvent(wxEventType commandType=0, int id=0);
 #ifndef SWIG