X-Git-Url: https://ecere.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ecere%2Fsrc%2Fgui%2Fskins%2FWindowsSkin.ec;h=8a861618f91d6c51f466096e2cb5d1195ec7b729;hb=a19a119c625751ce1296c0692c1426dcdb9c7989;hp=5ac1a204ea061c25610f50a677e4be412fd92ff1;hpb=0225c11798f54fdbac41f20af7d0111a08d064d4;p=sdk diff --git a/ecere/src/gui/skins/WindowsSkin.ec b/ecere/src/gui/skins/WindowsSkin.ec index 5ac1a20..8a86161 100644 --- a/ecere/src/gui/skins/WindowsSkin.ec +++ b/ecere/src/gui/skins/WindowsSkin.ec @@ -93,7 +93,7 @@ static ColorKey gradientInactive[] = { ColorAlpha { 255, Color { 192, 192, 192 } }, 1.00f } }; */ -char * cursorsBitmaps[] = +static const char * cursorsBitmaps[] = { "<:ecere>cursors/arrow.png", "<:ecere>cursors/iBeam.png", @@ -118,7 +118,7 @@ static Point cursorsHotSpots[] = { 5, 0 } }; -static char * skinBitmaps[SkinBitmap] = +static const char * skinBitmaps[SkinBitmap] = { "<:ecere>elements/areaMinimize.png", "<:ecere>elements/areaMaximize.png", @@ -152,7 +152,7 @@ class WindowsSkin : Skin #endif } - char * ::CursorsBitmaps(uint id, int * hotSpotX, int *hotSpotY, byte ** paletteShades) + const char * ::CursorsBitmaps(uint id, int * hotSpotX, int *hotSpotY, byte ** paletteShades) { *hotSpotX = cursorsHotSpots[id].x; *hotSpotY = cursorsHotSpots[id].y; @@ -332,7 +332,7 @@ public class WindowsSkin_Window : Window *ch = Max(*ch, 0); } - void ShowDecorations(Font captionFont, Surface surface, char * name, bool active, bool moving) + void ShowDecorations(Font captionFont, Surface surface, const char * name, bool active, bool moving) { bool isNormal = (state == normal); int top = 0, border = 0, bottom = 0; @@ -632,7 +632,7 @@ public class WindowsSkin_Button : Button { ButtonState state = this.buttonState; Bitmap buttonBitmap = bitmap ? bitmap.bitmap : null; - char * text = this.text; + const char * text = this.text; int offset = (state == down && this.offset) ? 1 : 0; Color backColor = background; int isDefault = this.isDefault;