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

Changed __GTK__, __WINDOWS__ and __MOTIF__ to __WXGTK__, __WXMSW__ and __WXMOTIF__

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-07-10 14:15:17 +00:00
parent 7007fcfced
commit 2049ba38ad
154 changed files with 481 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/gdicmn.cpp
View File

@@ -31,7 +31,7 @@
#include <string.h>
#ifdef __WINDOWS__
#ifdef __WXMSW__
#include <windows.h>
#endif
@@ -146,7 +146,7 @@ void wxColourDatabase::Initialize ()
cdef cc;
static cdef table[]={
#ifdef __WINDOWS__
#ifdef __WXMSW__
{"AQUAMARINE",112, 219, 147},
{"BLACK",0, 0, 0},
{"BLUE", 0, 0, 255},
@@ -220,7 +220,7 @@ void wxColourDatabase::Initialize ()
{"YELLOW GREEN", 153, 204, 50},
#endif
#if defined(__GTK__) || defined(__X__)
#if defined(__WXGTK__) || defined(__X__)
{"MEDIUM GOLDENROD", 234, 234, 173},
{"MEDIUM FOREST GREEN", 107, 142, 35},
{"LIGHT MAGENTA", 255, 0, 255},
@@ -252,11 +252,11 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
if (node)
return (wxColour *)node->Data();
#ifdef __WINDOWS__
#ifdef __WXMSW__
else return NULL;
#endif
#ifdef __GTK__
#ifdef __WXGTK__
else {
wxColour *col = new wxColour( colour );
@@ -273,7 +273,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
else {
XColor xcolour;
#ifdef __MOTIF__
#ifdef __WXMOTIF__
Display *display = XtDisplay(wxTheApp->topLevel) ;
#endif
#ifdef __XVIEW__
@@ -326,7 +326,7 @@ wxInitializeStockObjects ()
wxTheFontList = new wxFontList;
wxTheBitmapList = new wxBitmapList;
#ifdef __MOTIF__
#ifdef __WXMOTIF__
#endif
#ifdef __X__
wxFontPool = new XFontPool;
@@ -542,7 +542,7 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
wxFontList::~wxFontList ()
{
#ifdef __WINDOWS__
#ifdef __WXMSW__
wxNode *node = First ();
while (node)
{
@@ -585,7 +585,7 @@ wxFont *wxFontList::
each_font->GetStyle () == Style &&
each_font->GetWeight () == Weight &&
each_font->GetUnderlined () == underline &&
#if defined(__X__) || (defined(__WINDOWS__) && USE_PORTABLE_FONTS_IN_MSW)
#if defined(__X__) || (defined(__WXMSW__) && USE_PORTABLE_FONTS_IN_MSW)
each_font->GetFontId () == FamilyOrFontId) /* New font system */
#else
each_font->GetFamily () == FamilyOrFontId &&