- Timestamp:
- 11/20/07 23:45:14 (1 year ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
Mulberry/trunk/Sources_Common/Formatting/CParserHTMLStack.h
r19 r143 45 45 #if __dest_os == __mac_os || __dest_os == __mac_os_x 46 46 CParserHTMLFontStackElement(ETag, int start, RGBColor color, int size, int font); 47 #elif __dest_os == __win32_os || __linux_os47 #elif __dest_os == __win32_os || __dest_os == __linux_os 48 48 CParserHTMLFontStackElement(ETag, int start, RGBColor color, int size, const char* font); 49 49 #else … … 56 56 #if __dest_os == __mac_os || __dest_os == __mac_os_x 57 57 int mFont; 58 #elif __dest_os == __win32_os || __linux_os58 #elif __dest_os == __win32_os || __dest_os == __linux_os 59 59 cdstring mFont; 60 60 #else … … 63 63 64 64 int GetRed() 65 #if __dest_os == __mac_os || __dest_os == __mac_os_x || __linux_os65 #if __dest_os == __mac_os || __dest_os == __mac_os_x || __dest_os == __linux_os 66 66 { return mColor.red; } 67 67 #elif __dest_os == __win32_os … … 71 71 #endif 72 72 int GetGreen() 73 #if __dest_os == __mac_os || __dest_os == __mac_os_x || __linux_os73 #if __dest_os == __mac_os || __dest_os == __mac_os_x || __dest_os == __linux_os 74 74 { return mColor.green; } 75 75 #elif __dest_os == __win32_os … … 79 79 #endif 80 80 int GetBlue() 81 #if __dest_os == __mac_os || __dest_os == __mac_os_x || __linux_os81 #if __dest_os == __mac_os || __dest_os == __mac_os_x || __dest_os == __linux_os 82 82 { return mColor.blue; } 83 83 #elif __dest_os == __win32_os … … 91 91 int GetFont() 92 92 { return mFont; } 93 #elif __dest_os == __win32_os || __linux_os93 #elif __dest_os == __win32_os || __dest_os == __linux_os 94 94 const char* GetFont() 95 95 { return mFont.c_str(); }
