Added methods for folding

dropTarget is now allocated with new

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/include/wx/stc/stc.h b/contrib/include/wx/stc/stc.h
index 4920f70b33db80c0b0447416f1492f95718b5f18..628d87fd3d0143672e838e325e7444720c7e5044 100644 (file)
--- a/contrib/include/wx/stc/stc.h
+++ b/contrib/include/wx/stc/stc.h
@@ -386,7 +386,20 @@ public:
     // TODO: create a wx wrapper for Scintilla's document class
 
 
     // TODO: create a wx wrapper for Scintilla's document class
 
 

-    // TODO: Folding
+    // Folding
+    int      VisibleFromDocLine(int docLine);
+    int      DocLineFromVisible(int displayLine);
+    int      SetFoldLevel(int line, int level);
+    int      GetFoldLevel(int line);
+    int      GetLastChild(int line);
+    int      GetFoldParent(int line);
+    void     ShowLines(int lineStart, int lineEnd);
+    void     HideLines(int lineStart, int lineEnd);
+    bool     GetLineVisible(int line);
+    void     SetFoldExpanded(int line);
+    bool     GetFoldExpanded(int line);
+    void     ToggleFold(int line);
+    void     EnsureVisible(int line);

 
 
     // Long Lines
 
 
     // Long Lines

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index d4b02e8e6d13e7664f3a93a36c1e33d8b8cb8483..e85c952886ed241db5a3ee8c4be9284f5b0e3357 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -808,7 +808,7 @@ void wxStyledTextCtrl::SetMarginSensitive(int margin, bool sensitive) {
 
 
 bool wxStyledTextCtrl::GetMarginSensitive(int margin) {
 
 
 bool wxStyledTextCtrl::GetMarginSensitive(int margin) {

-    return SendMsg(SCI_GETMARGINSENSITIVEN, margin);
+    return SendMsg(SCI_GETMARGINSENSITIVEN, margin) != 0;

 }
 
 
 }
 
 


@@ -1106,6 +1106,74 @@ void wxStyledTextCtrl::SetDocument(void* document) {
 }
 
 
 }
 
 

+//----------------------------------------------------------------------
+// Folding
+
+int  wxStyledTextCtrl::VisibleFromDocLine(int docLine) {
+    return SendMsg(SCI_VISIBLEFROMDOCLINE, docLine);
+}
+
+
+int  wxStyledTextCtrl::DocLineFromVisible(int displayLine) {
+    return SendMsg(SCI_DOCLINEFROMVISIBLE, displayLine);
+}
+
+
+int  wxStyledTextCtrl::SetFoldLevel(int line, int level) {
+    return SendMsg(SCI_SETFOLDLEVEL, line, level);
+}
+
+
+int  wxStyledTextCtrl::GetFoldLevel(int line) {
+    return SendMsg(SCI_GETFOLDLEVEL,  line);
+}
+
+
+int  wxStyledTextCtrl::GetLastChild(int line) {
+    return SendMsg(SCI_GETLASTCHILD,  line);
+}
+
+
+int  wxStyledTextCtrl::GetFoldParent(int line) {
+    return SendMsg(SCI_GETFOLDPARENT,  line);
+}
+
+
+void wxStyledTextCtrl::ShowLines(int lineStart, int lineEnd) {
+    SendMsg(SCI_SHOWLINES, lineStart, lineEnd);
+}
+
+
+void wxStyledTextCtrl::HideLines(int lineStart, int lineEnd) {
+    SendMsg(SCI_HIDELINES, lineStart, lineEnd);
+}
+
+
+bool wxStyledTextCtrl::GetLineVisible(int line) {
+    return SendMsg(SCI_GETLINEVISIBLE, line) != 0;
+}
+
+
+void wxStyledTextCtrl::SetFoldExpanded(int line) {
+    SendMsg(SCI_SETFOLDEXPANDED, line);
+}
+
+
+bool wxStyledTextCtrl::GetFoldExpanded(int line) {
+    return SendMsg(SCI_GETFOLDEXPANDED, line) != 0;
+}
+
+
+void wxStyledTextCtrl::ToggleFold(int line) {
+    SendMsg(SCI_TOGGLEFOLD, line);
+}
+
+
+void wxStyledTextCtrl::EnsureVisible(int line) {
+    SendMsg(SCI_ENSUREVISIBLE, line);
+}
+
+

 //----------------------------------------------------------------------
 // Long Lines
 
 //----------------------------------------------------------------------
 // Long Lines
 

diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h
index 4920f70b33db80c0b0447416f1492f95718b5f18..628d87fd3d0143672e838e325e7444720c7e5044 100644 (file)
--- a/include/wx/stc/stc.h
+++ b/include/wx/stc/stc.h
@@ -386,7 +386,20 @@ public:
     // TODO: create a wx wrapper for Scintilla's document class
 
 
     // TODO: create a wx wrapper for Scintilla's document class
 
 

-    // TODO: Folding
+    // Folding
+    int      VisibleFromDocLine(int docLine);
+    int      DocLineFromVisible(int displayLine);
+    int      SetFoldLevel(int line, int level);
+    int      GetFoldLevel(int line);
+    int      GetLastChild(int line);
+    int      GetFoldParent(int line);
+    void     ShowLines(int lineStart, int lineEnd);
+    void     HideLines(int lineStart, int lineEnd);
+    bool     GetLineVisible(int line);
+    void     SetFoldExpanded(int line);
+    bool     GetFoldExpanded(int line);
+    void     ToggleFold(int line);
+    void     EnsureVisible(int line);

 
 
     // Long Lines
 
 
     // Long Lines

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index d4b02e8e6d13e7664f3a93a36c1e33d8b8cb8483..e85c952886ed241db5a3ee8c4be9284f5b0e3357 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -808,7 +808,7 @@ void wxStyledTextCtrl::SetMarginSensitive(int margin, bool sensitive) {
 
 
 bool wxStyledTextCtrl::GetMarginSensitive(int margin) {
 
 
 bool wxStyledTextCtrl::GetMarginSensitive(int margin) {

-    return SendMsg(SCI_GETMARGINSENSITIVEN, margin);
+    return SendMsg(SCI_GETMARGINSENSITIVEN, margin) != 0;

 }
 
 
 }
 
 


@@ -1106,6 +1106,74 @@ void wxStyledTextCtrl::SetDocument(void* document) {
 }
 
 
 }
 
 

+//----------------------------------------------------------------------
+// Folding
+
+int  wxStyledTextCtrl::VisibleFromDocLine(int docLine) {
+    return SendMsg(SCI_VISIBLEFROMDOCLINE, docLine);
+}
+
+
+int  wxStyledTextCtrl::DocLineFromVisible(int displayLine) {
+    return SendMsg(SCI_DOCLINEFROMVISIBLE, displayLine);
+}
+
+
+int  wxStyledTextCtrl::SetFoldLevel(int line, int level) {
+    return SendMsg(SCI_SETFOLDLEVEL, line, level);
+}
+
+
+int  wxStyledTextCtrl::GetFoldLevel(int line) {
+    return SendMsg(SCI_GETFOLDLEVEL,  line);
+}
+
+
+int  wxStyledTextCtrl::GetLastChild(int line) {
+    return SendMsg(SCI_GETLASTCHILD,  line);
+}
+
+
+int  wxStyledTextCtrl::GetFoldParent(int line) {
+    return SendMsg(SCI_GETFOLDPARENT,  line);
+}
+
+
+void wxStyledTextCtrl::ShowLines(int lineStart, int lineEnd) {
+    SendMsg(SCI_SHOWLINES, lineStart, lineEnd);
+}
+
+
+void wxStyledTextCtrl::HideLines(int lineStart, int lineEnd) {
+    SendMsg(SCI_HIDELINES, lineStart, lineEnd);
+}
+
+
+bool wxStyledTextCtrl::GetLineVisible(int line) {
+    return SendMsg(SCI_GETLINEVISIBLE, line) != 0;
+}
+
+
+void wxStyledTextCtrl::SetFoldExpanded(int line) {
+    SendMsg(SCI_SETFOLDEXPANDED, line);
+}
+
+
+bool wxStyledTextCtrl::GetFoldExpanded(int line) {
+    return SendMsg(SCI_GETFOLDEXPANDED, line) != 0;
+}
+
+
+void wxStyledTextCtrl::ToggleFold(int line) {
+    SendMsg(SCI_TOGGLEFOLD, line);
+}
+
+
+void wxStyledTextCtrl::EnsureVisible(int line) {
+    SendMsg(SCI_ENSUREVISIBLE, line);
+}
+
+

 //----------------------------------------------------------------------
 // Long Lines
 
 //----------------------------------------------------------------------
 // Long Lines