Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blind fix for typo in 50972.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2008-01-02 13:09:17 +00:00
parent 31c0639151
commit 038c03337f
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/stc/PlatWX.cpp
View File

@@ -372,7 +372,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
// TODO: do something with cornerSize // TODO: do something with cornerSize
wxUnusedVar(cornerSize); wxUnusedVar(cornerSize);
int x, y; int x, y;
wxRect r = wxRectFromPRectangle(rc); wxRect r = wxRectFromPRectangle(rc);
wxBitmap bmp(r.width, r.height, 32); wxBitmap bmp(r.width, r.height, 32);
@@ -392,7 +392,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
p.Green() = wxPy_premultiply(green, alphaFill); p.Green() = wxPy_premultiply(green, alphaFill);
p.Blue() = wxPy_premultiply(blue, alphaFill); p.Blue() = wxPy_premultiply(blue, alphaFill);
p.Alpha() = alphaFill; p.Alpha() = alphaFill;
++p; ++p;
} }
} }
@@ -406,12 +406,12 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
p.Red() = wxPy_premultiply(red, alphaOutline); p.Red() = wxPy_premultiply(red, alphaOutline);
p.Green() = wxPy_premultiply(green, alphaOutline); p.Green() = wxPy_premultiply(green, alphaOutline);
p.Blue() = wxPy_premultiply(blue, alphaOutline); p.Blue() = wxPy_premultiply(blue, alphaOutline);
p.Alpha() = alphaOutline; p.Alpha() = alphaOutline;
p.MoveTo(pixData, x, r.height-1); p.MoveTo(pixData, x, r.height-1);
p.Red() = wxPy_premultiply(red, alphaOutline); p.Red() = wxPy_premultiply(red, alphaOutline);
p.Green() = wxPy_premultiply(green, alphaOutline); p.Green() = wxPy_premultiply(green, alphaOutline);
p.Blue() = wxPy_premultiply(blue, alphaOutline); p.Blue() = wxPy_premultiply(blue, alphaOutline);
p.Alpha() = alphaOutline; p.Alpha() = alphaOutline;
} }
for (y=0; y<r.height; y++) { for (y=0; y<r.height; y++) {
@@ -419,14 +419,14 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize,
p.Red() = wxPy_premultiply(red, alphaOutline); p.Red() = wxPy_premultiply(red, alphaOutline);
p.Green() = wxPy_premultiply(green, alphaOutline); p.Green() = wxPy_premultiply(green, alphaOutline);
p.Blue() = wxPy_premultiply(blue, alphaOutline); p.Blue() = wxPy_premultiply(blue, alphaOutline);
p.Alpha() = alphaOutline; p.Alpha() = alphaOutline;
p.MoveTo(pixData, r.width-1, y); p.MoveTo(pixData, r.width-1, y);
p.Red() = wxPy_premultiply(red, alphaOutline); p.Red() = wxPy_premultiply(red, alphaOutline);
p.Green() = wxPy_premultiply(green, alphaOutline); p.Green() = wxPy_premultiply(green, alphaOutline);
p.Blue() = wxPy_premultiply(blue, alphaOutline); p.Blue() = wxPy_premultiply(blue, alphaOutline);
p.Alpha() = alphaOutline; p.Alpha() = alphaOutline;
} }
// Draw the bitmap // Draw the bitmap
hdc->DrawBitmap(bmp, r.x, r.y, true); hdc->DrawBitmap(bmp, r.x, r.y, true);
@@ -823,7 +823,7 @@ public:
wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) : wxSTCListBoxWin(wxWindow* parent, wxWindowID id, Point WXUNUSED(location)) :
wxPopupWindow(parent, wxBORDER_NONE) wxPopupWindow(parent, wxBORDER_NONE)
{ {
SetBackgroundColour(*wxBLACK); // for our simple border SetBackgroundColour(*wxBLACK); // for our simple border
lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize, lv = new wxSTCListBox(parent, id, wxPoint(-50,-50), wxDefaultSize,
@@ -946,7 +946,7 @@ public:
wxFRAME_NO_TASKBAR wxFRAME_NO_TASKBAR
| wxFRAME_FLOAT_ON_PARENT | wxFRAME_FLOAT_ON_PARENT
#ifdef __WXMAC__ #ifdef __WXMAC__
| wxPOPUP_WINDOW | wxPOPUP_WINDOW
| wxNO_BORDER | wxNO_BORDER
#else #else
| wxSIMPLE_BORDER | wxSIMPLE_BORDER
@@ -965,7 +965,7 @@ public:
lv->SetFocus(); lv->SetFocus();
Hide(); Hide();
} }
// On OSX and (possibly others) there can still be pending // On OSX and (possibly others) there can still be pending
@@ -1035,7 +1035,7 @@ public:
if (frame) if (frame)
frame->Raise(); frame->Raise();
} }
virtual void DoSetSize(int x, int y, virtual void DoSetSize(int x, int y,
int width, int height, int width, int height,
@@ -1234,7 +1234,7 @@ void ListBoxImpl::Append(char *s, int type) {
void ListBoxImpl::Append(const wxString& text, int type) { void ListBoxImpl::Append(const wxString& text, int type) {
long count = GETLB(id)->GetItemCount(); long count = GETLB(id)->GetItemCount();
long itemID = GETLB(id)->InsertItem(count, wxEmptyString); long itemID = GETLB(id)->InsertItem(count, wxEmptyString);
ling idx = -1; long idx = -1;
GETLB(id)->SetItem(itemID, 1, text); GETLB(id)->SetItem(itemID, 1, text);
maxStrWidth = wxMax(maxStrWidth, text.length()); maxStrWidth = wxMax(maxStrWidth, text.length());
if (type != -1) { if (type != -1) {