diff --git a/uppsrc/CtrlCore/CocoImage.mm b/uppsrc/CtrlCore/CocoImage.mm index a3461aa85..233c9abe9 100644 --- a/uppsrc/CtrlCore/CocoImage.mm +++ b/uppsrc/CtrlCore/CocoImage.mm @@ -26,7 +26,7 @@ struct ImageSysData { ~ImageSysData(); }; -// Note: Coca U++ has to ignore paintonly flag as the data of image are directly referenced by +// Note: Cocoa U++ has to ignore paintonly flag as the data of image are directly referenced by // data provider void ImageSysData::Init(const Image& m) diff --git a/uppsrc/CtrlCore/ToDo.txt b/uppsrc/CtrlCore/ToDo.txt index 1d5ca2da7..d8d57b61c 100644 --- a/uppsrc/CtrlCore/ToDo.txt +++ b/uppsrc/CtrlCore/ToDo.txt @@ -4,6 +4,9 @@ - Classic is broken - Inactive doc icon is not updated - [B] does not blink anymore - Make allocator work +- ClassicCtrlsImg +- FileChooser +- Remove menu slide effect NTH: diff --git a/uppsrc/CtrlLib/ChCoco.cpp b/uppsrc/CtrlLib/ChCoco.cpp index f7b8acd23..b41518117 100644 --- a/uppsrc/CtrlLib/ChCoco.cpp +++ b/uppsrc/CtrlLib/ChCoco.cpp @@ -74,9 +74,10 @@ void ChHostSkin() ChReset(); GUI_GlobalStyle_Write(GUISTYLE_XP); + GUI_PopUpEffect_Write(GUIEFFECT_NONE); SwapOKCancel_Write(true); - SColorFace_Write(CocoColor(COCO_WINDOW, White())); // ThemeBrushDialogBackgroundActive + SColorFace_Write(CocoColor(COCO_WINDOW, White())); SColorHighlight_Write(CocoColor(COCO_SELECTEDPAPER)); SColorHighlightText_Write(CocoColor(COCO_SELECTEDTEXT)); SColorText_Write(CocoColor(COCO_TEXT));