set SMALL_FONT for controls here because InheritAttributes() doesn't do it any longer

[wxWidgets.git] / contrib / src / deprecated / resource.cpp

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 74dd99e7e9fda27ff62e8d025f5ba2b12bbb6cd4..3d0188a9ec317a4c8091d3de51f397384707a7e8 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -70,6 +70,9 @@
 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"
 #endif
 

+#include "wx/splitter.h"
+#include "wx/toolbar.h"
+

 #include "wx/validate.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/validate.h"
 #include "wx/log.h"
 #include "wx/module.h"


@@ -86,6 +89,11 @@
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 

+#if !WXWIN_COMPATIBILITY_2_4
+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+#endif
+

 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
 wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
 wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);


@@ -156,13 +164,13 @@ wxItemResource::wxItemResource()
 
 wxItemResource::~wxItemResource()
 {
 
 wxItemResource::~wxItemResource()
 {

-    wxNode *node = m_children.First();
+    wxNode *node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxItemResource *item = (wxItemResource *)node->Data();
+        wxItemResource *item = (wxItemResource *)node->GetData();

         delete item;
         delete node;
         delete item;
         delete node;

-        node = m_children.First();
+        node = m_children.GetFirst();

     }
 }
 
     }
 }
 


@@ -207,11 +215,10 @@ bool wxResourceTable::DeleteResource(const wxString& name)
         // See if any resource has this as its child; if so, delete from
         // parent's child list.
         BeginFind();
         // See if any resource has this as its child; if so, delete from
         // parent's child list.
         BeginFind();

-        wxNode *node = (wxNode *) NULL;
-        node = Next();
+        wxNode *node = Next();

         while (node != NULL)
         {
         while (node != NULL)
         {

-            wxItemResource *parent = (wxItemResource *)node->Data();
+            wxItemResource *parent = (wxItemResource *)node->GetData();

             if (parent->GetChildren().Member(item))
             {
                 parent->GetChildren().DeleteObject(item);
             if (parent->GetChildren().Member(item))
             {
                 parent->GetChildren().DeleteObject(item);


@@ -306,7 +313,7 @@ void wxResourceTable::ClearTable()
     while (node)
     {
         wxNode *next = Next();
     while (node)
     {
         wxNode *next = Next();

-        wxItemResource *item = (wxItemResource *)node->Data();
+        wxItemResource *item = (wxItemResource *)node->GetData();

         delete item;
         delete node;
         node = next;
         delete item;
         delete node;
         node = next;


@@ -456,17 +463,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxListBox(parent, id, pos, size,
             }
         }
         control = new wxListBox(parent, id, pos, size,


@@ -480,17 +487,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxChoice(parent, id, pos, size,
             }
         }
         control = new wxChoice(parent, id, pos, size,


@@ -505,17 +512,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,
             }
         }
         control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,


@@ -530,17 +537,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,
             }
         }
         control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,


@@ -579,10 +586,10 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
 
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
 {
 
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
 {

-    wxNode *node = db.First();
+    wxNode *node = db.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxExpr *clause = (wxExpr *)node->Data();
+        wxExpr *clause = (wxExpr *)node->GetData();

         wxString functor(clause->Functor());
 
         wxItemResource *item = (wxItemResource *) NULL;
         wxString functor(clause->Functor());
 
         wxItemResource *item = (wxItemResource *) NULL;


@@ -608,7 +615,7 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
                 table.DeleteResource(item->GetName());
             table.AddResource(item);
         }
                 table.DeleteResource(item->GetName());
             table.AddResource(item);
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     return TRUE;
 }
     }
     return TRUE;
 }


@@ -1535,7 +1542,7 @@ bool wxReallocateResourceBuffer()
 
 static bool wxEatWhiteSpace(FILE *fd)
 {
 
 static bool wxEatWhiteSpace(FILE *fd)
 {

-    int ch = 0;
+    int ch;

 
     while ((ch = getc(fd)) != EOF)
     {
 
     while ((ch = getc(fd)) != EOF)
     {


@@ -2383,10 +2390,10 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum bitmap for this platform/colour depth
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum bitmap for this platform/colour depth

-        wxNode *node = item->GetChildren().First();
+        wxNode *node = item->GetChildren().GetFirst();

         while (node)
         {
         while (node)
         {

-            wxItemResource *child = (wxItemResource *)node->Data();
+            wxItemResource *child = (wxItemResource *)node->GetData();

             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*
             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*


@@ -2457,7 +2464,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
             default:
                 break;
             }
             default:
                 break;
             }

-            node = node->Next();
+            node = node->GetNext();

         }
         // If no matching resource, fail.
         if (!optResource)
         }
         // If no matching resource, fail.
         if (!optResource)


@@ -2537,10 +2544,10 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum icon for this platform/colour depth
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum icon for this platform/colour depth

-        wxNode *node = item->GetChildren().First();
+        wxNode *node = item->GetChildren().GetFirst();

         while (node)
         {
         while (node)
         {

-            wxItemResource *child = (wxItemResource *)node->Data();
+            wxItemResource *child = (wxItemResource *)node->GetData();

             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*
             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*


@@ -2611,7 +2618,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             default:
                 break;
             }
             default:
                 break;
             }

-            node = node->Next();
+            node = node->GetNext();

         }
         // If no matching resource, fail.
         if (!optResource)
         }
         // If no matching resource, fail.
         if (!optResource)


@@ -2660,7 +2667,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
                 break;
 #else
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
                 break;
 #else

-                return wxIcon(name, bitmapType);
+                return wxIcon(name, (wxBitmapType) bitmapType);

 #endif
             }
         }
 #endif
             }
         }


@@ -2678,13 +2685,13 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;
 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;

-    wxNode *node = item->GetChildren().First();
+    wxNode *node = item->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxItemResource *child = (wxItemResource *)node->Data();
+        wxItemResource *child = (wxItemResource *)node->GetData();

         if ((child->GetType() != wxT("")) && (child->GetType() == wxT("wxMenuSeparator")))
             menu->AppendSeparator();
         if ((child->GetType() != wxT("")) && (child->GetType() == wxT("wxMenuSeparator")))
             menu->AppendSeparator();

-        else if (child->GetChildren().Number() > 0)
+        else if (child->GetChildren().GetCount() > 0)

         {
             wxMenu *subMenu = wxResourceCreateMenu(child);
             if (subMenu)
         {
             wxMenu *subMenu = wxResourceCreateMenu(child);
             if (subMenu)


@@ -2694,7 +2701,7 @@ wxMenu *wxResourceCreateMenu(wxItemResource *item)
         {
             menu->Append((int)child->GetValue1(), child->GetTitle(), child->GetValue4(), (child->GetValue2() != 0));
         }
         {
             menu->Append((int)child->GetValue1(), child->GetTitle(), child->GetValue4(), (child->GetValue2() != 0));
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     return menu;
 }
     }
     return menu;
 }


@@ -2709,14 +2716,14 @@ wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *ta
     {
         if (!menuBar)
             menuBar = new wxMenuBar;
     {
         if (!menuBar)
             menuBar = new wxMenuBar;

-        wxNode *node = menuResource->GetChildren().First();
+        wxNode *node = menuResource->GetChildren().GetFirst();

         while (node)
         {
         while (node)
         {

-            wxItemResource *child = (wxItemResource *)node->Data();
+            wxItemResource *child = (wxItemResource *)node->GetData();

             wxMenu *menu = wxResourceCreateMenu(child);
             if (menu)
                 menuBar->Append(menu, child->GetTitle());
             wxMenu *menu = wxResourceCreateMenu(child);
             if (menu)
                 menuBar->Append(menu, child->GetTitle());

-            node = node->Next();
+            node = node->GetNext();

         }
         return menuBar;
     }
         }
         return menuBar;
     }


@@ -2868,7 +2875,7 @@ static int ungetc_string()
 
 bool wxEatWhiteSpaceString(char *s)
 {
 
 bool wxEatWhiteSpaceString(char *s)
 {

-    int ch = 0;
+    int ch;

 
     while ((ch = getc_string(s)) != EOF)
     {
 
     while ((ch = getc_string(s)) != EOF)
     {


@@ -2881,7 +2888,6 @@ bool wxEatWhiteSpaceString(char *s)
             break;
         case '/':
             {
             break;
         case '/':
             {

-                int prev_ch = ch;

                 ch = getc_string(s);
                 if (ch == EOF)
                 {
                 ch = getc_string(s);
                 if (ch == EOF)
                 {


@@ -2892,7 +2898,7 @@ bool wxEatWhiteSpaceString(char *s)
                 if (ch == '*')
                 {
                     // Eat C comment
                 if (ch == '*')
                 {
                     // Eat C comment

-                    prev_ch = 0;
+                    int prev_ch = 0;

                     while ((ch = getc_string(s)) != EOF)
                     {
                         if (ch == '/' && prev_ch == '*')
                     while ((ch = getc_string(s)) != EOF)
                     {
                         if (ch == '/' && prev_ch == '*')


@@ -3120,7 +3126,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxResourceParseString(const wxString& s, wxResourceTable *table)
+bool wxResourceParseString(const wxString& s, wxResourceTable *WXUNUSED(table))

 {
 #if wxUSE_UNICODE
     return wxResourceParseString( (char*)s.mb_str().data() );
 {
 #if wxUSE_UNICODE
     return wxResourceParseString( (char*)s.mb_str().data() );


@@ -3243,14 +3249,14 @@ bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString&
     }
 
     // Now create children
     }
 
     // Now create children

-    wxNode *node = resource->GetChildren().First();
+    wxNode *node = resource->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxItemResource *childResource = (wxItemResource *)node->Data();
+        wxItemResource *childResource = (wxItemResource *)node->GetData();

 
         (void) wxCreateItem(thisWindow, childResource, resource, table);
 
 
         (void) wxCreateItem(thisWindow, childResource, resource, table);
 

-        node = node->Next();
+        node = node->GetNext();

     }
     return TRUE;
 }
     }
     return TRUE;
 }