ThreadnoGui compiles now.

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

diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp
index edf16d508eebb7ae3091307296c4a87252a9f46a..7ab3528f6c5fb413c3d2000707bdf43c6d311d7d 100644 (file)
--- a/src/common/gdicmn.cpp
+++ b/src/common/gdicmn.cpp
@@ -36,22 +36,24 @@
 #endif
 
 #if !USE_SHARED_LIBRARY
 #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;
 }
 

-wxRect::wxRect(const long xx, const long yy, const long w, const long h)
+wxRect::wxRect(long xx, long yy, long w, long h)

 {
     x = xx; y = yy; width = w; height = h;
 }
 {
     x = xx; y = yy; width = w; height = h;
 }


@@ -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.


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

-wxInitializeStockObjects (void)
+wxInitializeStockObjects ()

 {
   wxTheBrushList = new wxBrushList;
   wxThePenList = new wxPenList;
 {
   wxTheBrushList = new wxBrushList;
   wxThePenList = new wxPenList;


@@ -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)


@@ -454,7 +456,7 @@ void wxPenList::RemovePen (wxPen * pen)
   DeleteObject (pen);
 }
 
   DeleteObject (pen);
 }
 

-wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, const int width, const int style)
+wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, int width, int style)

 {
   for (wxNode * node = First (); node; node = node->Next ())
     {
 {
   for (wxNode * node = First (); node; node = node->Next ())
     {


@@ -477,7 +479,7 @@ wxPen *wxPenList::FindOrCreatePen (const wxColour& colour, const int width, cons
   return pen;
 }
 
   return pen;
 }
 

-wxPen *wxPenList::FindOrCreatePen (const wxString& colour, const int width, const int style)
+wxPen *wxPenList::FindOrCreatePen (const wxString& colour, int width, int style)

 {
   wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
   if (the_colour)
 {
   wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
   if (the_colour)


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

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

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


@@ -503,7 +505,7 @@ void wxBrushList::AddBrush (wxBrush * brush)
   Append (brush);
 }
 
   Append (brush);
 }
 

-wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, const int style)
+wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, int style)

 {
   for (wxNode * node = First (); node; node = node->Next ())
     {
 {
   for (wxNode * node = First (); node; node = node->Next ())
     {


@@ -524,7 +526,7 @@ wxBrush *wxBrushList::FindOrCreateBrush (const wxColour& colour, const int style
   return brush;
 }
 
   return brush;
 }
 

-wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, const int style)
+wxBrush *wxBrushList::FindOrCreateBrush (const wxString& colour, int style)

 {
   wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
   if (the_colour)
 {
   wxColour *the_colour = wxTheColourDatabase->FindColour (colour);
   if (the_colour)


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

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

 {
 #ifdef __WINDOWS__
   wxNode *node = First ();
 {
 #ifdef __WINDOWS__
   wxNode *node = First ();


@@ -573,7 +575,7 @@ void wxFontList::RemoveFont (wxFont * font)
 }
 
 wxFont *wxFontList::
 }
 
 wxFont *wxFontList::

-       FindOrCreateFont (const int PointSize, const int FamilyOrFontId, const int Style, const int Weight, const bool underline, const wxString& Face)
+       FindOrCreateFont (int PointSize, int FamilyOrFontId, int Style, int Weight, bool underline, const wxString& Face)

 {
   for (wxNode * node = First (); node; node = node->Next ())
     {
 {
   for (wxNode * node = First (); node; node = node->Next ())
     {


@@ -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);
+}
+