[Igarden-commit] CommonSource/CalendarView CalendarView.cpp, 1.8, 1.9
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 01:15:32
|
Update of /cvsroot/igarden/CommonSource/CalendarView In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11373 Modified Files: CalendarView.cpp Log Message: Change #error to #warning to ease porting Index: CalendarView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/CalendarView/CalendarView.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CalendarView.cpp 9 Oct 2006 01:29:35 -0000 1.8 --- CalendarView.cpp 18 Oct 2006 01:15:29 -0000 1.9 *************** *** 20,24 **** // //===================================================================================== - #if OPT_MACOS //===================================================================================== --- 20,23 ---- *************** *** 84,87 **** --- 83,87 ---- #pragma mark --- Object Construction / Destruction --- + //===================================================================================== // *************** *** 517,521 **** --- 517,527 ---- { //Setup the drawing pen + #if OPT_MACOS ::PenSize( 1, 1 ); + #elif OPT_XWIN + #warning ***Won't support CalendarView Fix OPT_MACOS later in this file + #else + #error TO_BE_PORTED + #endif //Draw the elements of the calendar *************** *** 827,830 **** --- 833,837 ---- if ( !IsActive() ) { + #if OPT_MACOS RGBColor foreColor; ::GetForeColor( &foreColor ); *************** *** 833,836 **** --- 840,844 ---- foreColor.blue = (uint16) (foreColor.blue + 65535 >> 1); ::RGBForeColor( &foreColor ); + #endif } *************** *** 879,883 **** --- 887,893 ---- //Erase the rect for the previous arrows and setup the port's text traits. + #if OPT_MACOS ::EraseRect( &mPrevMonthRect ); + #endif draw.SetFontObject(XGFont::LoadFont(mArrowsTTID)); *************** *** 885,888 **** --- 895,899 ---- if ( !IsActive() || inPrevHit ) { + #if OPT_MACOS RGBColor foreColor; ::GetForeColor( &foreColor ); *************** *** 891,894 **** --- 902,906 ---- foreColor.blue = (uint16) (foreColor.blue + 65535 >> 1); ::RGBForeColor( &foreColor ); + #endif } *************** *** 905,909 **** //If the control is not active, then lighten the text color if ( !IsActive() || inNextHit ) { ! RGBColor foreColor; ::GetForeColor( &foreColor ); --- 917,921 ---- //If the control is not active, then lighten the text color if ( !IsActive() || inNextHit ) { ! #if OPT_MACOS RGBColor foreColor; ::GetForeColor( &foreColor ); *************** *** 912,915 **** --- 924,928 ---- foreColor.blue = (uint16) (foreColor.blue + 65535 >> 1); ::RGBForeColor( &foreColor ); + #endif } *************** *** 950,953 **** --- 963,967 ---- if ( !IsActive() ) { + #if OPT_MACOS RGBColor foreColor; ::GetForeColor( &foreColor ); *************** *** 956,959 **** --- 970,974 ---- foreColor.blue = (uint16) (foreColor.blue + 65535 >> 1); ::RGBForeColor( &foreColor ); + #endif } *************** *** 972,975 **** --- 987,991 ---- } + //===================================================================================== // *************** *** 1020,1023 **** --- 1036,1040 ---- } + //===================================================================================== // *************** *** 1174,1178 **** //If the control is not active, then lighten the text color if ( !IsActive() ) { ! RGBColor foreColor; ::GetForeColor( &foreColor ); --- 1191,1196 ---- //If the control is not active, then lighten the text color if ( !IsActive() ) { ! ! #if OPT_MACOS RGBColor foreColor; ::GetForeColor( &foreColor ); *************** *** 1181,1184 **** --- 1199,1203 ---- foreColor.blue = (uint16) (foreColor.blue + 65535 >> 1); ::RGBForeColor( &foreColor ); + #endif } *************** *** 1324,1328 **** //=====EOF===========================================================================// - #else - #error TO_BE_PORTED - #endif --- 1343,1344 ---- |