ssize_t for wxFile, unsigned char markup for color components, whitespace source...

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

diff --git a/contrib/src/stc/PlatWX.cpp b/contrib/src/stc/PlatWX.cpp
index ec10a85950ad1069da3eb6347d6005240671c3cd..b3232e6aa575dc3bed12e58b861df13b4d53d49f 100644 (file)
--- a/contrib/src/stc/PlatWX.cpp
+++ b/contrib/src/stc/PlatWX.cpp
@@ -40,7 +40,9 @@ PRectangle PRectangleFromwxRect(wxRect rc) {
 
 wxColour wxColourFromCA(const ColourAllocated& ca) {
     ColourDesired cd(ca.AsLong());
-    return wxColour(cd.GetRed(), cd.GetGreen(), cd.GetBlue());
+    return wxColour((unsigned char)cd.GetRed(),
+                    (unsigned char)cd.GetGreen(),
+                    (unsigned char)cd.GetBlue());
 }
 
 //----------------------------------------------------------------------
@@ -1015,7 +1017,8 @@ void ListBoxImpl::GetValue(int n, char *value, int len) {
 
 void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
     wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
-    wxBitmap bmp(wxImage(stream, wxBITMAP_TYPE_XPM));
+    wxImage img(stream, wxBITMAP_TYPE_XPM);
+    wxBitmap bmp(img);
 
     if (! imgList) {
         // assumes all images are the same size
@@ -1254,7 +1257,7 @@ double ElapsedTime::Duration(bool reset) {
 
 // Convert using Scintilla's functions instead of wx's, Scintilla's are more
 // forgiving and won't assert...
-    
+
 wxString stc2wx(const char* str, size_t len)
 {
     if (!len)
@@ -1286,7 +1289,6 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 
     // TODO check NULL termination!!
 
-    
     return buffer;
 }
 

diff --git a/contrib/src/stc/ScintillaWX.cpp b/contrib/src/stc/ScintillaWX.cpp
index c12d3ff2691a4da890f9bc9885dd521d313b2add..05709cb689e00dfefba36be88de849cb37961adc 100644 (file)
--- a/contrib/src/stc/ScintillaWX.cpp
+++ b/contrib/src/stc/ScintillaWX.cpp
@@ -750,12 +750,12 @@ void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
 void ScintillaWX::DoAddChar(int key) {
 #if wxUSE_UNICODE
     wxChar wszChars[2];
-    wszChars[0] = key;
+    wszChars[0] = (wxChar)key;
     wszChars[1] = 0;
     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
     AddCharUTF((char*)buf.data(), strlen(buf));
 #else
-    AddChar(key);
+    AddChar((char)key);
 #endif
 }
 

diff --git a/contrib/src/stc/stc.cpp b/contrib/src/stc/stc.cpp
index 845ccb41f9558e427503b0bfa868740928877398..0462c270ff271348fb6351f9dfd6ba78f0b28f94 100644 (file)
--- a/contrib/src/stc/stc.cpp
+++ b/contrib/src/stc/stc.cpp
@@ -46,7 +46,9 @@ static long wxColourAsLong(const wxColour& co) {
 
 static wxColour wxColourFromLong(long c) {
     wxColour clr;
-    clr.Set(c & 0xff, (c >> 8) & 0xff, (c >> 16) & 0xff);
+    clr.Set((unsigned char)(c & 0xff),
+            (unsigned char)((c >> 8) & 0xff),
+            (unsigned char)((c >> 16) & 0xff));
     return clr;
 }
 
@@ -60,7 +62,9 @@ static wxColour wxColourFromSpec(const wxString& spec) {
         spec.Mid(1,2).ToLong(&red,   16);
         spec.Mid(3,2).ToLong(&green, 16);
         spec.Mid(5,2).ToLong(&blue,  16);
-        return wxColour(red, green, blue);
+        return wxColour((unsigned char)red,
+                        (unsigned char)green,
+                        (unsigned char)blue);
     }
     else
         return wxColour(spec);
@@ -516,7 +520,6 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
         buff[len] = 0;
         SendMsg(2049, markerNumber, (long)buff);
         delete [] buff;
-        
 }
 
 // Set a margin to be either numeric or symbolic.
@@ -900,7 +903,6 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         buff[len] = 0;
         SendMsg(2405, type, (long)buff);
         delete [] buff;
-     
 }
 
 // Clear all the registered images.
@@ -1071,34 +1073,34 @@ int wxStyledTextCtrl::FindText(int minPos, int maxPos,
 }
 
 // On Windows, will draw the document into a display context such as a printer.
- int wxStyledTextCtrl::FormatRange(bool   doDraw,
-                int    startPos,
-                int    endPos,
-                wxDC*  draw,
-                wxDC*  target, 
-                wxRect renderRect,
-                wxRect pageRect) {
-             RangeToFormat fr;
-
-             if (endPos < startPos) {
-                 int temp = startPos;
-                 startPos = endPos;
-                 endPos = temp;
-             }
-             fr.hdc = draw;
-             fr.hdcTarget = target;
-             fr.rc.top = renderRect.GetTop();
-             fr.rc.left = renderRect.GetLeft();
-             fr.rc.right = renderRect.GetRight();
-             fr.rc.bottom = renderRect.GetBottom();
-             fr.rcPage.top = pageRect.GetTop();
-             fr.rcPage.left = pageRect.GetLeft();
-             fr.rcPage.right = pageRect.GetRight();
-             fr.rcPage.bottom = pageRect.GetBottom();
-             fr.chrg.cpMin = startPos;
-             fr.chrg.cpMax = endPos;
-
-             return SendMsg(2151, doDraw, (long)&fr);
+int wxStyledTextCtrl::FormatRange(bool   doDraw,
+                                   int    startPos,
+                                   int    endPos,
+                                   wxDC*  draw,
+                                   wxDC*  target,
+                                   wxRect renderRect,
+                                   wxRect pageRect) {
+    RangeToFormat fr;
+
+    if (endPos < startPos) {
+        int temp = startPos;
+        startPos = endPos;
+        endPos = temp;
+    }
+    fr.hdc = draw;
+    fr.hdcTarget = target;
+    fr.rc.top = renderRect.GetTop();
+    fr.rc.left = renderRect.GetLeft();
+    fr.rc.right = renderRect.GetRight();
+    fr.rc.bottom = renderRect.GetBottom();
+    fr.rcPage.top = pageRect.GetTop();
+    fr.rcPage.left = pageRect.GetLeft();
+    fr.rcPage.right = pageRect.GetRight();
+    fr.rcPage.bottom = pageRect.GetBottom();
+    fr.chrg.cpMin = startPos;
+    fr.chrg.cpMax = endPos;
+
+    return SendMsg(2151, doDraw, (long)&fr);
 }
 
 // Retrieve the display line at the top of the display.
@@ -2603,7 +2605,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
     if (file.IsOpened())
     {
         wxString contents;
-        size_t len = (size_t)file.Length();
+        // get the file size (assume it is not huge file...)
+        ssize_t len = (ssize_t)file.Length();
+
         if (len > 0)
         {
 #if wxUSE_UNICODE
@@ -2620,7 +2624,12 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 #endif
         }
         else
-            success = true;            // empty file is ok
+        {
+            if (len == 0)
+                success = true;  // empty file is ok
+            else
+                success = false; // len == wxInvalidOffset
+        }
 
         if (success)
         {

diff --git a/src/stc/PlatWX.cpp b/src/stc/PlatWX.cpp
index ec10a85950ad1069da3eb6347d6005240671c3cd..b3232e6aa575dc3bed12e58b861df13b4d53d49f 100644 (file)
--- a/src/stc/PlatWX.cpp
+++ b/src/stc/PlatWX.cpp
@@ -40,7 +40,9 @@ PRectangle PRectangleFromwxRect(wxRect rc) {
 
 wxColour wxColourFromCA(const ColourAllocated& ca) {
     ColourDesired cd(ca.AsLong());
-    return wxColour(cd.GetRed(), cd.GetGreen(), cd.GetBlue());
+    return wxColour((unsigned char)cd.GetRed(),
+                    (unsigned char)cd.GetGreen(),
+                    (unsigned char)cd.GetBlue());
 }
 
 //----------------------------------------------------------------------
@@ -1015,7 +1017,8 @@ void ListBoxImpl::GetValue(int n, char *value, int len) {
 
 void ListBoxImpl::RegisterImage(int type, const char *xpm_data) {
     wxMemoryInputStream stream(xpm_data, strlen(xpm_data)+1);
-    wxBitmap bmp(wxImage(stream, wxBITMAP_TYPE_XPM));
+    wxImage img(stream, wxBITMAP_TYPE_XPM);
+    wxBitmap bmp(img);
 
     if (! imgList) {
         // assumes all images are the same size
@@ -1254,7 +1257,7 @@ double ElapsedTime::Duration(bool reset) {
 
 // Convert using Scintilla's functions instead of wx's, Scintilla's are more
 // forgiving and won't assert...
-    
+
 wxString stc2wx(const char* str, size_t len)
 {
     if (!len)
@@ -1286,7 +1289,6 @@ const wxWX2MBbuf wx2stc(const wxString& str)
 
     // TODO check NULL termination!!
 
-    
     return buffer;
 }
 

diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp
index c12d3ff2691a4da890f9bc9885dd521d313b2add..05709cb689e00dfefba36be88de849cb37961adc 100644 (file)
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -750,12 +750,12 @@ void ScintillaWX::DoMiddleButtonUp(Point WXUNUSED(pt)) {
 void ScintillaWX::DoAddChar(int key) {
 #if wxUSE_UNICODE
     wxChar wszChars[2];
-    wszChars[0] = key;
+    wszChars[0] = (wxChar)key;
     wszChars[1] = 0;
     wxWX2MBbuf buf = (wxWX2MBbuf)wx2stc(wszChars);
     AddCharUTF((char*)buf.data(), strlen(buf));
 #else
-    AddChar(key);
+    AddChar((char)key);
 #endif
 }
 

diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp
index 845ccb41f9558e427503b0bfa868740928877398..0462c270ff271348fb6351f9dfd6ba78f0b28f94 100644 (file)
--- a/src/stc/stc.cpp
+++ b/src/stc/stc.cpp
@@ -46,7 +46,9 @@ static long wxColourAsLong(const wxColour& co) {
 
 static wxColour wxColourFromLong(long c) {
     wxColour clr;
-    clr.Set(c & 0xff, (c >> 8) & 0xff, (c >> 16) & 0xff);
+    clr.Set((unsigned char)(c & 0xff),
+            (unsigned char)((c >> 8) & 0xff),
+            (unsigned char)((c >> 16) & 0xff));
     return clr;
 }
 
@@ -60,7 +62,9 @@ static wxColour wxColourFromSpec(const wxString& spec) {
         spec.Mid(1,2).ToLong(&red,   16);
         spec.Mid(3,2).ToLong(&green, 16);
         spec.Mid(5,2).ToLong(&blue,  16);
-        return wxColour(red, green, blue);
+        return wxColour((unsigned char)red,
+                        (unsigned char)green,
+                        (unsigned char)blue);
     }
     else
         return wxColour(spec);
@@ -516,7 +520,6 @@ void wxStyledTextCtrl::MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp)
         buff[len] = 0;
         SendMsg(2049, markerNumber, (long)buff);
         delete [] buff;
-        
 }
 
 // Set a margin to be either numeric or symbolic.
@@ -900,7 +903,6 @@ void wxStyledTextCtrl::RegisterImage(int type, const wxBitmap& bmp) {
         buff[len] = 0;
         SendMsg(2405, type, (long)buff);
         delete [] buff;
-     
 }
 
 // Clear all the registered images.
@@ -1071,34 +1073,34 @@ int wxStyledTextCtrl::FindText(int minPos, int maxPos,
 }
 
 // On Windows, will draw the document into a display context such as a printer.
- int wxStyledTextCtrl::FormatRange(bool   doDraw,
-                int    startPos,
-                int    endPos,
-                wxDC*  draw,
-                wxDC*  target, 
-                wxRect renderRect,
-                wxRect pageRect) {
-             RangeToFormat fr;
-
-             if (endPos < startPos) {
-                 int temp = startPos;
-                 startPos = endPos;
-                 endPos = temp;
-             }
-             fr.hdc = draw;
-             fr.hdcTarget = target;
-             fr.rc.top = renderRect.GetTop();
-             fr.rc.left = renderRect.GetLeft();
-             fr.rc.right = renderRect.GetRight();
-             fr.rc.bottom = renderRect.GetBottom();
-             fr.rcPage.top = pageRect.GetTop();
-             fr.rcPage.left = pageRect.GetLeft();
-             fr.rcPage.right = pageRect.GetRight();
-             fr.rcPage.bottom = pageRect.GetBottom();
-             fr.chrg.cpMin = startPos;
-             fr.chrg.cpMax = endPos;
-
-             return SendMsg(2151, doDraw, (long)&fr);
+int wxStyledTextCtrl::FormatRange(bool   doDraw,
+                                   int    startPos,
+                                   int    endPos,
+                                   wxDC*  draw,
+                                   wxDC*  target,
+                                   wxRect renderRect,
+                                   wxRect pageRect) {
+    RangeToFormat fr;
+
+    if (endPos < startPos) {
+        int temp = startPos;
+        startPos = endPos;
+        endPos = temp;
+    }
+    fr.hdc = draw;
+    fr.hdcTarget = target;
+    fr.rc.top = renderRect.GetTop();
+    fr.rc.left = renderRect.GetLeft();
+    fr.rc.right = renderRect.GetRight();
+    fr.rc.bottom = renderRect.GetBottom();
+    fr.rcPage.top = pageRect.GetTop();
+    fr.rcPage.left = pageRect.GetLeft();
+    fr.rcPage.right = pageRect.GetRight();
+    fr.rcPage.bottom = pageRect.GetBottom();
+    fr.chrg.cpMin = startPos;
+    fr.chrg.cpMax = endPos;
+
+    return SendMsg(2151, doDraw, (long)&fr);
 }
 
 // Retrieve the display line at the top of the display.
@@ -2603,7 +2605,9 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
     if (file.IsOpened())
     {
         wxString contents;
-        size_t len = (size_t)file.Length();
+        // get the file size (assume it is not huge file...)
+        ssize_t len = (ssize_t)file.Length();
+
         if (len > 0)
         {
 #if wxUSE_UNICODE
@@ -2620,7 +2624,12 @@ bool wxStyledTextCtrl::LoadFile(const wxString& filename)
 #endif
         }
         else
-            success = true;            // empty file is ok
+        {
+            if (len == 0)
+                success = true;  // empty file is ok
+            else
+                success = false; // len == wxInvalidOffset
+        }
 
         if (success)
         {