fix for focus handling when deleting the items

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 08709571b96b7e27e7b13d8096d2fd25aec17553..8f7a71f1d309ae1a191a1f3ffd35333eb260fba3 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -53,6 +53,8 @@
 #include "wx/intl.h"
 #endif
 
 #include "wx/intl.h"
 #endif
 

+#include "wx/listctrl.h"
+

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


@@ -227,11 +229,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;


@@ -2652,6 +2650,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;


@@ -2712,6 +2712,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)
 {