removed (unused) nCtlColor parameter of OnCtlColor(); added MSWControlColor(); implem...

[wxWidgets.git] / src / stc / stc.cpp

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index e0e4260914bb4a6edd3876cf4c63acc31e0fa4dd..845ccb41f9558e427503b0bfa868740928877398 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -190,7 +190,26 @@ long wxStyledTextCtrl::SendMsg(int msg, long wp, long lp) {
     return m_swx->WndProc(msg, wp, lp);
 }
 
     return m_swx->WndProc(msg, wp, lp);
 }
 

+//----------------------------------------------------------------------

 
 

+// Set the vertical scrollbar to use instead of the ont that's built-in.
+void wxStyledTextCtrl::SetVScrollBar(wxScrollBar* bar)  {
+    m_vScrollBar = bar;
+    if (bar != NULL) {
+        // ensure that the built-in scrollbar is not visible
+        SetScrollbar(wxVERTICAL, 0, 0, 0);
+    }
+}
+
+
+// Set the horizontal scrollbar to use instead of the ont that's built-in.
+void wxStyledTextCtrl::SetHScrollBar(wxScrollBar* bar)  {
+    m_hScrollBar = bar;
+    if (bar != NULL) {
+        // ensure that the built-in scrollbar is not visible
+        SetScrollbar(wxHORIZONTAL, 0, 0, 0);
+    }
+}

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


@@ -497,7 +516,7 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
         buff[len] = 0;
         SendMsg(2049, markerNumber, (long)buff);
         delete [] buff;
         buff[len] = 0;
         SendMsg(2049, markerNumber, (long)buff);
         delete [] buff;

-
+        

 }
 
 // Set a margin to be either numeric or symbolic.
 }
 
 // Set a margin to be either numeric or symbolic.


@@ -881,7 +900,7 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         buff[len] = 0;
         SendMsg(2405, type, (long)buff);
         delete [] buff;
         buff[len] = 0;
         SendMsg(2405, type, (long)buff);
         delete [] buff;

-
+     

 }
 
 // Clear all the registered images.
 }
 
 // Clear all the registered images.


@@ -1056,7 +1075,7 @@ int wxStyledTextCtrl::FindText(int minPos, int maxPos,
                 int    startPos,
                 int    endPos,
                 wxDC*  draw,
                 int    startPos,
                 int    endPos,
                 wxDC*  draw,

-                wxDC*  target,
+                wxDC*  target, 

                 wxRect renderRect,
                 wxRect pageRect) {
              RangeToFormat fr;
                 wxRect renderRect,
                 wxRect pageRect) {
              RangeToFormat fr;


@@ -2584,7 +2603,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
     if (file.IsOpened())
     {
         wxString contents;
     if (file.IsOpened())
     {
         wxString contents;

-        size_t len = file.Length();
+        size_t len = (size_t)file.Length();

         if (len > 0)
         {
 #if wxUSE_UNICODE
         if (len > 0)
         {
 #if wxUSE_UNICODE


@@ -2601,7 +2620,7 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 #endif
         }
         else
 #endif
         }
         else

-            success = true; // empty file is ok
+            success = true;            // empty file is ok

 
         if (success)
         {
 
         if (success)
         {