ssize_t for wxFile, unsigned char markup for color components, whitespace source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user