wxWindow::OnSize() does _not_ call Layout() (it should only be done for

[wxWidgets.git] / src / common / gdicmn.cpp

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index 2624cdbcca96139b12077f8814f611e1323f4c27..a30a772c7a450885ceab76555d6a82473d375602 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -31,22 +31,24 @@
 
 #include <string.h>
 
 
 #include <string.h>
 

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

 #include <windows.h>
 #endif
 
 #if !USE_SHARED_LIBRARY
 #include <windows.h>
 #endif
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)

 IMPLEMENT_CLASS(wxColourDatabase, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)
 IMPLEMENT_CLASS(wxColourDatabase, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxFontList, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxPenList, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxBrushList, wxList)
 IMPLEMENT_DYNAMIC_CLASS(wxBitmapList, wxList)

+/*
+IMPLEMENT_DYNAMIC_CLASS(wxRect, wxObject)

 IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxPoint, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxRealPoint, wxObject)

+*/

 #endif
 
 #endif
 

-wxRect::wxRect(void)
+wxRect::wxRect()

 {
     x = 0; y = 0; width = 0; height = 0;
 }
 {
     x = 0; y = 0; width = 0; height = 0;
 }


@@ -117,7 +119,7 @@ wxList (type)
 {
 }
 
 {
 }
 

-wxColourDatabase::~wxColourDatabase (void)
+wxColourDatabase::~wxColourDatabase ()

 {
   // Cleanup Colour allocated in Initialize()
   wxNode *node = First ();
 {
   // Cleanup Colour allocated in Initialize()
   wxNode *node = First ();


@@ -131,7 +133,7 @@ wxColourDatabase::~wxColourDatabase (void)
 }
 
 // Colour database stuff
 }
 
 // Colour database stuff

-void wxColourDatabase::Initialize (void)
+void wxColourDatabase::Initialize ()

 {
   // Don't initialize for X: colours are found
   // in FindColour below.
 {
   // Don't initialize for X: colours are found
   // in FindColour below.


@@ -144,7 +146,7 @@ void wxColourDatabase::Initialize (void)
   cdef cc;
   static cdef table[]={
   
   cdef cc;
   static cdef table[]={
   

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

    {"AQUAMARINE",112, 219, 147},
    {"BLACK",0, 0, 0},
    {"BLUE", 0, 0, 255},
    {"AQUAMARINE",112, 219, 147},
    {"BLACK",0, 0, 0},
    {"BLUE", 0, 0, 255},


@@ -218,7 +220,7 @@ void wxColourDatabase::Initialize (void)
    {"YELLOW GREEN", 153, 204, 50},
 #endif
 
    {"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},
    {"MEDIUM GOLDENROD", 234, 234, 173},
    {"MEDIUM FOREST GREEN", 107, 142, 35},
    {"LIGHT MAGENTA", 255, 0, 255},


@@ -250,11 +252,11 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
   if (node)
     return (wxColour *)node->Data();
     
   if (node)
     return (wxColour *)node->Data();
     

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   else return NULL;
 #endif
 
   else return NULL;
 #endif
 

-#ifdef __GTK__
+#ifdef __WXGTK__

   else {
     wxColour *col = new wxColour( colour );
     
   else {
     wxColour *col = new wxColour( colour );
     


@@ -271,7 +273,7 @@ wxColour *wxColourDatabase::FindColour(const wxString& colour)
   else {
     XColor xcolour;
 
   else {
     XColor xcolour;
 

-#ifdef __MOTIF__
+#ifdef __WXMOTIF__

     Display *display = XtDisplay(wxTheApp->topLevel) ;
 #endif
 #ifdef __XVIEW__
     Display *display = XtDisplay(wxTheApp->topLevel) ;
 #endif
 #ifdef __XVIEW__


@@ -317,14 +319,14 @@ wxString wxColourDatabase::FindName (const wxColour& colour) const
 }
 
 void 
 }
 
 void 

-wxInitializeStockObjects (void)
+wxInitializeStockObjects ()

 {
   wxTheBrushList = new wxBrushList;
   wxThePenList = new wxPenList;
   wxTheFontList = new wxFontList;
   wxTheBitmapList = new wxBitmapList;
 
 {
   wxTheBrushList = new wxBrushList;
   wxThePenList = new wxPenList;
   wxTheFontList = new wxFontList;
   wxTheBitmapList = new wxBitmapList;
 

-#ifdef __MOTIF__
+#ifdef __WXMOTIF__

 #endif
 #ifdef __X__
   wxFontPool = new XFontPool;
 #endif
 #ifdef __X__
   wxFontPool = new XFontPool;


@@ -371,7 +373,7 @@ wxInitializeStockObjects (void)
 }
 
 void 
 }
 
 void 

-wxDeleteStockObjects (void)
+wxDeleteStockObjects ()

 {
   DELETEP(wxNORMAL_FONT);
   DELETEP(wxSMALL_FONT);
 {
   DELETEP(wxNORMAL_FONT);
   DELETEP(wxSMALL_FONT);


@@ -413,11 +415,11 @@ wxDeleteStockObjects (void)
   DELETEP(wxCROSS_CURSOR);
 }
 
   DELETEP(wxCROSS_CURSOR);
 }
 

-wxBitmapList::wxBitmapList (void)
+wxBitmapList::wxBitmapList ()

 {
 }
 
 {
 }
 

-wxBitmapList::~wxBitmapList (void)
+wxBitmapList::~wxBitmapList ()

 {
   wxNode *node = First ();
   while (node)
 {
   wxNode *node = First ();
   while (node)


@@ -431,7 +433,7 @@ wxBitmapList::~wxBitmapList (void)
 }
 
 // Pen and Brush lists
 }
 
 // Pen and Brush lists

-wxPenList::~wxPenList (void)
+wxPenList::~wxPenList ()

 {
   wxNode *node = First ();
   while (node)
 {
   wxNode *node = First ();
   while (node)


@@ -486,7 +488,7 @@ wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)
     return NULL;
 }
 
     return NULL;
 }
 

-wxBrushList::~wxBrushList (void)
+wxBrushList::~wxBrushList ()

 {
   wxNode *node = First ();
   while (node)
 {
   wxNode *node = First ();
   while (node)


@@ -538,9 +540,9 @@ void wxBrushList::RemoveBrush (wxBrush * brush)
   DeleteObject (brush);
 }
 
   DeleteObject (brush);
 }
 

-wxFontList::~wxFontList (void)
+wxFontList::~wxFontList ()

 {
 {

-#ifdef __WINDOWS__
+#ifdef __WXMSW__

   wxNode *node = First ();
   while (node)
     {
   wxNode *node = First ();
   while (node)
     {


@@ -583,7 +585,7 @@ wxFont *wxFontList::
          each_font->GetStyle () == Style &&
          each_font->GetWeight () == Weight &&
          each_font->GetUnderlined () == underline &&
          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 &&
          each_font->GetFontId () == FamilyOrFontId) /* New font system */
 #else
          each_font->GetFamily () == FamilyOrFontId &&


@@ -601,3 +603,10 @@ void wxBitmapList::AddBitmap(wxBitmap *bitmap)
 void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)
 { DeleteObject(bitmap); }
 
 void wxBitmapList::RemoveBitmap(wxBitmap *bitmap)
 { DeleteObject(bitmap); }
 

+wxSize wxGetDisplaySize()
+{
+    int x, y;
+    wxDisplaySize(& x, & y);
+    return wxSize(x, y);
+}
+