applied patch 475879 (Can't use subclassed GridCellEditor)

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index bef7bdb0e4d835ace5a29debb34f2e33a32331d3..63151ab13ba1daf4be381ce2ec475d33d56b02a9 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -53,6 +53,9 @@
 #include "wx/intl.h"
 #endif
 
 #include "wx/intl.h"
 #endif
 

+#include "wx/treebase.h"
+#include "wx/listctrl.h"
+

 #if wxUSE_RADIOBTN
 #include "wx/radiobut.h"
 #endif
 #if wxUSE_RADIOBTN
 #include "wx/radiobut.h"
 #endif


@@ -227,11 +230,7 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
     wxExprDatabase db;
 
 {
     wxExprDatabase db;
 

-#if defined(__WXMAC__) && !defined(__UNIX__)
-    FILE *fd = fopen(wxUnix2MacFilename(filename.fn_str()), "r");
-#else  

     FILE *fd = wxFopen(filename, _T("r"));
     FILE *fd = wxFopen(filename, _T("r"));

-#endif

     if (!fd)
         return FALSE;
     bool eof = FALSE;
     if (!fd)
         return FALSE;
     bool eof = FALSE;


@@ -2468,7 +2467,6 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {

-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)

                 wxItemResource *item = table->FindResource(name);
                 if (!item)
                 {
                 wxItemResource *item = table->FindResource(name);
                 if (!item)
                 {


@@ -2476,10 +2474,6 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
                     return wxNullBitmap;
                 }
                 return wxBitmap((char **)item->GetValue1());
                     return wxNullBitmap;
                 }
                 return wxBitmap((char **)item->GetValue1());

-#else
-                wxLogWarning(_("No XPM facility available!"));
-                break;
-#endif

             }
         default:
             {
             }
         default:
             {


@@ -2625,7 +2619,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             {
                 // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
                 /*
             {
                 // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
                 /*

-                #if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)

                 wxItemResource *item = table->FindResource(name);
                 if (!item)
                 {
                 wxItemResource *item = table->FindResource(name);
                 if (!item)
                 {


@@ -2635,9 +2628,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
                 return NULL;
                 }
                 return wxIcon((char **)item->GetValue1());
                 return NULL;
                 }
                 return wxIcon((char **)item->GetValue1());

-                #else
-                wxLogWarning(_("No XPM facility available!"));
-                #endif

                 */
                 wxLogWarning(_("No XPM icon facility available!"));
                 break;
                 */
                 wxLogWarning(_("No XPM icon facility available!"));
                 break;


@@ -2661,6 +2651,8 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
   }
 }
 
   }
 }
 

+#if wxUSE_MENUS
+

 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;
 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;


@@ -2721,6 +2713,8 @@ wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)
     return (wxMenu *) NULL;
 }
 
     return (wxMenu *) NULL;
 }
 

+#endif // wxUSE_MENUS
+

 // Global equivalents (so don't have to refer to default table explicitly)
 bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
 {
 // Global equivalents (so don't have to refer to default table explicitly)
 bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
 {


@@ -3151,27 +3145,31 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
     int height = resource->GetHeight();
     wxString name = resource->GetName();
 
     int height = resource->GetHeight();
     wxString name = resource->GetName();
 

-    if (IsKindOf(CLASSINFO(wxDialog)))
+    // this is used for loading wxWizard pages from WXR
+    if ( parent != this )

     {
     {

-        wxDialog *dialogBox = (wxDialog *)this;
-        long modalStyle = isModal ? wxDIALOG_MODAL : 0;
-        if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
-            return FALSE;
+        if (IsKindOf(CLASSINFO(wxDialog)))
+        {
+            wxDialog *dialogBox = (wxDialog *)this;
+            long modalStyle = isModal ? wxDIALOG_MODAL : 0;
+            if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
+                return FALSE;

 
 

-        // Only reset the client size if we know we're not going to do it again below.
-        if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)
-            dialogBox->SetClientSize(width, height);
-    }
-    else if (IsKindOf(CLASSINFO(wxPanel)))
-    {
-        wxPanel* panel = (wxPanel *)this;
-        if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
-            return FALSE;
-    }
-    else
-    {
-        if (!((wxWindow *)this)->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
-            return FALSE;
+            // Only reset the client size if we know we're not going to do it again below.
+            if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)
+                dialogBox->SetClientSize(width, height);
+        }
+        else if (IsKindOf(CLASSINFO(wxPanel)))
+        {
+            wxPanel* panel = (wxPanel *)this;
+            if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
+                return FALSE;
+        }
+        else
+        {
+            if (!((wxWindow *)this)->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
+                return FALSE;
+        }

     }
 
     if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
     }
 
     if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)