From 696eeadebaafc16fe7c253affa823414bdb9b179 Mon Sep 17 00:00:00 2001 From: lixun910 Date: Tue, 19 Apr 2016 12:02:34 -0600 Subject: [PATCH] fix ubuntu basemap rendering bug --- BuildTools/ubuntu/build64.sh | 8 +- Explore/MapNewView.cpp | 99 ++++++++++++--- Explore/MapNewView.h | 20 ++- GeoDamake.opt | 40 +++--- rc/GdaAppResources.cpp | 240 +++++++++++++++++------------------ 5 files changed, 240 insertions(+), 167 deletions(-) diff --git a/BuildTools/ubuntu/build64.sh b/BuildTools/ubuntu/build64.sh index e6ec5318e..7ebe3fbc4 100755 --- a/BuildTools/ubuntu/build64.sh +++ b/BuildTools/ubuntu/build64.sh @@ -143,7 +143,7 @@ install_library c-ares-1.10.0 http://c-ares.haxx.se/download/c-ares-1.10.0.tar.g ######################################################################### LIB_NAME=curl-7.46.0 -LIB_CHECKER=libcurl.a1 +LIB_CHECKER=libcurl.a LIB_URL=https://dl.dropboxusercontent.com/u/145979/geoda_libraries/curl-7.46.0.zip LIB_FILENAME=curl-7.46.0.zip echo $LIB_NAME @@ -573,9 +573,9 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" chmod +x configure chmod +x install-sh ./configure - #cp -rf $GEODA_HOME/dep/gdal-1.9.2/* . - #cp GDALmake64.opt GDALmake.opt - #make clean + cp -rf $GEODA_HOME/dep/gdal-1.9.2/* . + cp GDALmake64.opt GDALmake.opt + make clean $MAKER make install #cd ogr/ogrsf_frmts/oci diff --git a/Explore/MapNewView.cpp b/Explore/MapNewView.cpp index 36f49fd30..5c5dab871 100644 --- a/Explore/MapNewView.cpp +++ b/Explore/MapNewView.cpp @@ -110,7 +110,12 @@ void SliderDialog::OnSliderChange( wxScrollEvent & event ) IMPLEMENT_CLASS(MapCanvas, TemplateCanvas) BEGIN_EVENT_TABLE(MapCanvas, TemplateCanvas) +#ifdef __linux__ + // in Linux, using old paint function without transparency support + EVT_PAINT(TemplateCanvas::OnPaint) +#else EVT_PAINT(MapCanvas::OnPaint) +#endif EVT_ERASE_BACKGROUND(TemplateCanvas::OnEraseBackground) EVT_MOUSE_EVENTS(TemplateCanvas::OnMouseEvent) EVT_MOUSE_CAPTURE_LOST(TemplateCanvas::OnMouseCaptureLostEvent) @@ -216,24 +221,6 @@ MapCanvas::~MapCanvas() LOG_MSG("Exiting MapCanvas::~MapCanvas"); } -void MapCanvas::resizeLayerBms(int width, int height) -{ - deleteLayerBms(); - basemap_bm = new wxBitmap(width, height); - layer0_bm = new wxBitmap(width, height, 32); - layer1_bm = new wxBitmap(width, height, 32); - layer2_bm = new wxBitmap(width, height, 32); - final_bm = new wxBitmap(width, height); - - layer0_bm->UseAlpha(); - layer1_bm->UseAlpha(); - layer2_bm->UseAlpha(); - - layer0_valid = false; - layer1_valid = false; - layer2_valid = false; -} - bool MapCanvas::DrawBasemap(bool flag, int map_type) { isDrawBasemap = flag; @@ -287,7 +274,6 @@ bool MapCanvas::DrawBasemap(bool flag, int map_type) return true; } - void MapCanvas::DrawLayers() { if (layerbase_valid && layer2_valid && layer1_valid && layer0_valid) @@ -311,6 +297,7 @@ void MapCanvas::DrawLayers() DrawLayer2(); } + wxWakeUpIdle(); isRepaint = true; Refresh(true); } @@ -320,11 +307,81 @@ void MapCanvas::DrawLayerBase() if (isDrawBasemap) { if (basemap != 0) { layerbase_valid = basemap->Draw(basemap_bm); - wxWakeUpIdle(); +#ifdef __linux__ + // trigger to draw again, since it's drawing on ONE bitmap, + // not multilayer with transparency support + layer0_valid = false; +#endif } } } + +#ifdef __linux__ +void MapCanvas::resizeLayerBms(int width, int height) +{ + deleteLayerBms(); + basemap_bm = new wxBitmap(width, height); + layer0_bm = new wxBitmap(width, height); + layer1_bm = new wxBitmap(width, height); + layer2_bm = new wxBitmap(width, height); + final_bm = new wxBitmap(width, height); + + layerbase_valid = false; + layer0_valid = false; + layer1_valid = false; + layer2_valid = false; +} + +void MapCanvas::DrawLayer0() +{ + //LOG_MSG("In TemplateCanvas::DrawLayer0"); + wxSize sz = GetVirtualSize(); + wxMemoryDC dc(*layer0_bm); + + dc.SetPen(canvas_background_color); + dc.SetBrush(canvas_background_color); + dc.DrawRectangle(wxPoint(0,0), sz); + + if (isDrawBasemap) + dc.DrawBitmap(*basemap_bm, 0, 0); + + BOOST_FOREACH( GdaShape* shp, background_shps ) { + shp->paintSelf(dc); + } + if (draw_sel_shps_by_z_val) { + DrawSelectableShapesByZVal(dc); + } else { + DrawSelectableShapes(dc); + } + + layer0_valid = true; + layer1_valid = false; +} + +// in Linux, following 3 functions will be inherited from TemplateCanvas +//void MapCanvas::DrawLayer1() +//void MapCanvas::DrawLayer2() +//void MapCanvas::OnPaint(wxPaintEvent& event) + +#else +void MapCanvas::resizeLayerBms(int width, int height) +{ + deleteLayerBms(); + basemap_bm = new wxBitmap(width, height); + layer0_bm = new wxBitmap(width, height, 32); + layer1_bm = new wxBitmap(width, height, 32); + layer2_bm = new wxBitmap(width, height, 32); + final_bm = new wxBitmap(width, height); + layer0_bm->UseAlpha(); + layer1_bm->UseAlpha(); + layer2_bm->UseAlpha(); + + layer0_valid = false; + layer1_valid = false; + layer2_valid = false; +} + // Draw all solid background, background decorations and unhighlighted // shapes. void MapCanvas::DrawLayer0() @@ -441,6 +498,8 @@ void MapCanvas::OnPaint(wxPaintEvent& event) } event.Skip(); } +#endif + int MapCanvas::GetBasemapType() { diff --git a/Explore/MapNewView.h b/Explore/MapNewView.h index d9188939d..ff1291d59 100644 --- a/Explore/MapNewView.h +++ b/Explore/MapNewView.h @@ -116,14 +116,26 @@ class MapCanvas : public TemplateCanvas, public CatClassifStateObserver public: - virtual void resizeLayerBms(int width, int height); - virtual void OnPaint(wxPaintEvent& event); + bool DrawBasemap(bool flag, int map_type); virtual void DrawLayerBase(); + virtual void DrawLayers(); +#ifdef __linux__ + // in linux, use old style drawing without transparency support + // the commented out functions are inherited from TemplateCanvas class + // TODO will be replace by wxImage drawing code + virtual void resizeLayerBms(int width, int height); + virtual void DrawLayer0(); + //virtual void DrawLayer1(); + //virtual void DrawLayer2(); + //virtual void OnPaint(wxPaintEvent& event); +#else + virtual void resizeLayerBms(int width, int height); virtual void DrawLayer0(); virtual void DrawLayer1(); virtual void DrawLayer2(); - virtual void DrawLayers(); - bool DrawBasemap(bool flag, int map_type); + virtual void OnPaint(wxPaintEvent& event); +#endif + virtual void PopulateCanvas(); virtual void VarInfoAttributeChange(); diff --git a/GeoDamake.opt b/GeoDamake.opt index abeb5ac73..d238de47c 100644 --- a/GeoDamake.opt +++ b/GeoDamake.opt @@ -2,33 +2,35 @@ GeoDa_ROOT = $(GEODA_HOME)/../.. TARGET = GeoDa -CC = gcc -CXX = g++ -Os -arch x86_64 -LD = g++ -arch x86_64 +CC = /usr/bin/gcc +CXX = /usr/bin/g++ +LD = /usr/bin/g++ RM = /bin/rm -f -WXLIBS = $(shell $(GEODA_HOME)/libraries/bin/wx-config --libs xrc,stc,richtext,ribbon,propgrid,aui,gl,html,qa,adv,core,webview,xml,net,base) +WXLIBS = $(shell $(GEODA_HOME)/libraries/bin/wx-config --libs xrc,stc,richtext,ribbon,propgrid,aui,gl,html,webview,qa,adv,core,xml,net,base) WX_HEADER = $(shell $(GEODA_HOME)/libraries/bin/wx-config --cppflags) -LIBS = $(WXLIBS) \ - $(GEODA_HOME)/temp/CLAPACK-3.2.1/blas.a \ - $(GEODA_HOME)/temp/CLAPACK-3.2.1/F2CLIBS/libf2c.a \ - $(GEODA_HOME)/temp/CLAPACK-3.2.1/lapack.a \ - -L/usr/lib -liconv \ - -L$(GEODA_HOME)/libraries/lib -lgdal -lcurl \ - $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_thread.a \ - $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_system.a \ - $(GEODA_HOME)/libraries/lib/libjson_spirit.a - +LIBS = $(WXLIBS) \ + $(GEODA_HOME)/temp/CLAPACK-3.2.1/lapack.a \ + $(GEODA_HOME)/temp/CLAPACK-3.2.1/libf2c.a \ + $(GEODA_HOME)/temp/CLAPACK-3.2.1/blas.a \ + $(GEODA_HOME)/temp/CLAPACK-3.2.1/tmglib.a \ + $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_thread.a \ + $(GEODA_HOME)/libraries/include/boost/stage/lib/libboost_system.a \ + $(GEODA_HOME)/libraries/lib/libjson_spirit.a \ + -L$(GEODA_HOME)/libraries/lib -lgdal -lcurl -lcares \ + -L/usr/lib/x86_64-linux-gnu -lGL -lGLU -lglut -lrt -lidn -lssl -lrtmp +# Note: Library -lrtmp causes a missing library problem at runtime on +# Ubuntu 14.10 and later. BOOST_HEADER = -I$(GEODA_HOME)/libraries/include/boost -GDAL_HEADER = -I$(GEODA_HOME)/libraries/include +GDAL_HEADER = -I$(GEODA_HOME)/libraries/include -I/usr/include -CPPFLAGS = -I$(GeoDa_ROOT) $(USER_LOG) -CFLAGS = -Os -arch x86_64 -Wall -Wdeclaration-after-statement $(USER_DEFS) $(GDAL_HEADER) -CXXFLAGS = -Os -arch x86_64 -Wall $(USER_DEFS) $(WX_HEADER) $(BOOST_HEADER) $(GDAL_HEADER) -LDFLAGS = -arch x86_64 +CPPFLAGS = -I$(GeoDa_ROOT) +CFLAGS = -O2 -Wdeclaration-after-statement $(USER_DEFS) $(GDAL_HEADER) +CXXFLAGS = -O2 $(USER_DEFS) $(WX_HEADER) $(BOOST_HEADER) $(GDAL_HEADER) +LDFLAGS = OBJ_EXT = o diff --git a/rc/GdaAppResources.cpp b/rc/GdaAppResources.cpp index 9d951d72e..97c7be327 100644 --- a/rc/GdaAppResources.cpp +++ b/rc/GdaAppResources.cpp @@ -45302,130 +45302,130 @@ void GdaInitXmlResource() else wxFileSystem::AddHandler(new wxMemoryFSHandler); } - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$about-geoda-logo.png"), xml_res_file_0, xml_res_size_0, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$open-folder.png"), xml_res_file_1, xml_res_size_1, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$save.png"), xml_res_file_2, xml_res_size_2, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_3.png"), xml_res_file_3, xml_res_size_3, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_3_disabled.png"), xml_res_file_4, xml_res_size_4, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$dragdrop.png"), xml_res_file_5, xml_res_size_5, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$about-geoda-logo.png"), xml_res_file_0, xml_res_size_0, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$open-folder.png"), xml_res_file_1, xml_res_size_1, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$save.png"), xml_res_file_2, xml_res_size_2, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_3.png"), xml_res_file_3, xml_res_size_3, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_3_disabled.png"), xml_res_file_4, xml_res_size_4, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$dragdrop.png"), xml_res_file_5, xml_res_size_5, wxT("image/x-apple-ios-png")); XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$dialogs.xrc"), xml_res_file_6, xml_res_size_6, wxT("text/xml")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$8px_help.png"), xml_res_file_7, xml_res_size_7, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$8px_help.png"), xml_res_file_7, xml_res_size_7, wxT("image/x-apple-ios-png")); XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$data_viewer_dialogs.xrc"), xml_res_file_8, xml_res_size_8, wxT("text/xml")); XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$menus.xrc"), xml_res_file_9, xml_res_size_9, wxT("text/xml")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_01.png"), xml_res_file_10, xml_res_size_10, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_02.png"), xml_res_file_11, xml_res_size_11, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_02.png"), xml_res_file_12, xml_res_size_12, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_03.png"), xml_res_file_13, xml_res_size_13, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_03.png"), xml_res_file_14, xml_res_size_14, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_04.png"), xml_res_file_15, xml_res_size_15, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_04.png"), xml_res_file_16, xml_res_size_16, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_05.png"), xml_res_file_17, xml_res_size_17, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_05.png"), xml_res_file_18, xml_res_size_18, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_09.png"), xml_res_file_19, xml_res_size_19, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_09.png"), xml_res_file_20, xml_res_size_20, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_10.png"), xml_res_file_21, xml_res_size_21, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_10.png"), xml_res_file_22, xml_res_size_22, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_11.png"), xml_res_file_23, xml_res_size_23, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_11.png"), xml_res_file_24, xml_res_size_24, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_12.png"), xml_res_file_25, xml_res_size_25, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_12.png"), xml_res_file_26, xml_res_size_26, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_13.png"), xml_res_file_27, xml_res_size_27, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_13.png"), xml_res_file_28, xml_res_size_28, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_14.png"), xml_res_file_29, xml_res_size_29, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_14.png"), xml_res_file_30, xml_res_size_30, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_15.png"), xml_res_file_31, xml_res_size_31, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_15.png"), xml_res_file_32, xml_res_size_32, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_16.png"), xml_res_file_33, xml_res_size_33, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_16.png"), xml_res_file_34, xml_res_size_34, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_17.png"), xml_res_file_35, xml_res_size_35, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_17.png"), xml_res_file_36, xml_res_size_36, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_18.png"), xml_res_file_37, xml_res_size_37, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_18.png"), xml_res_file_38, xml_res_size_38, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_19.png"), xml_res_file_39, xml_res_size_39, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_19.png"), xml_res_file_40, xml_res_size_40, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_20.png"), xml_res_file_41, xml_res_size_41, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_20.png"), xml_res_file_42, xml_res_size_42, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_21.png"), xml_res_file_43, xml_res_size_43, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_21.png"), xml_res_file_44, xml_res_size_44, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_22.png"), xml_res_file_45, xml_res_size_45, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_22.png"), xml_res_file_46, xml_res_size_46, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_23.png"), xml_res_file_47, xml_res_size_47, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_23.png"), xml_res_file_48, xml_res_size_48, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_25.png"), xml_res_file_49, xml_res_size_49, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_25.png"), xml_res_file_50, xml_res_size_50, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_26.png"), xml_res_file_51, xml_res_size_51, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_26.png"), xml_res_file_52, xml_res_size_52, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_27.png"), xml_res_file_53, xml_res_size_53, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_27.png"), xml_res_file_54, xml_res_size_54, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_28.png"), xml_res_file_55, xml_res_size_55, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_29.png"), xml_res_file_56, xml_res_size_56, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_30.png"), xml_res_file_57, xml_res_size_57, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_31.png"), xml_res_file_58, xml_res_size_58, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_32.png"), xml_res_file_59, xml_res_size_59, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_33.png"), xml_res_file_60, xml_res_size_60, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_34.png"), xml_res_file_61, xml_res_size_61, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_36.png"), xml_res_file_62, xml_res_size_62, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_01.png"), xml_res_file_10, xml_res_size_10, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_02.png"), xml_res_file_11, xml_res_size_11, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_02.png"), xml_res_file_12, xml_res_size_12, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_03.png"), xml_res_file_13, xml_res_size_13, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_03.png"), xml_res_file_14, xml_res_size_14, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_04.png"), xml_res_file_15, xml_res_size_15, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_04.png"), xml_res_file_16, xml_res_size_16, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_05.png"), xml_res_file_17, xml_res_size_17, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_05.png"), xml_res_file_18, xml_res_size_18, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_09.png"), xml_res_file_19, xml_res_size_19, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_09.png"), xml_res_file_20, xml_res_size_20, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_10.png"), xml_res_file_21, xml_res_size_21, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_10.png"), xml_res_file_22, xml_res_size_22, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_11.png"), xml_res_file_23, xml_res_size_23, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_11.png"), xml_res_file_24, xml_res_size_24, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_12.png"), xml_res_file_25, xml_res_size_25, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_12.png"), xml_res_file_26, xml_res_size_26, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_13.png"), xml_res_file_27, xml_res_size_27, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_13.png"), xml_res_file_28, xml_res_size_28, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_14.png"), xml_res_file_29, xml_res_size_29, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_14.png"), xml_res_file_30, xml_res_size_30, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_15.png"), xml_res_file_31, xml_res_size_31, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_15.png"), xml_res_file_32, xml_res_size_32, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_16.png"), xml_res_file_33, xml_res_size_33, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_16.png"), xml_res_file_34, xml_res_size_34, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_17.png"), xml_res_file_35, xml_res_size_35, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_17.png"), xml_res_file_36, xml_res_size_36, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_18.png"), xml_res_file_37, xml_res_size_37, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_18.png"), xml_res_file_38, xml_res_size_38, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_19.png"), xml_res_file_39, xml_res_size_39, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_19.png"), xml_res_file_40, xml_res_size_40, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_20.png"), xml_res_file_41, xml_res_size_41, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_20.png"), xml_res_file_42, xml_res_size_42, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_21.png"), xml_res_file_43, xml_res_size_43, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_21.png"), xml_res_file_44, xml_res_size_44, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_22.png"), xml_res_file_45, xml_res_size_45, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_22.png"), xml_res_file_46, xml_res_size_46, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_23.png"), xml_res_file_47, xml_res_size_47, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_23.png"), xml_res_file_48, xml_res_size_48, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_25.png"), xml_res_file_49, xml_res_size_49, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_25.png"), xml_res_file_50, xml_res_size_50, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_26.png"), xml_res_file_51, xml_res_size_51, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_26.png"), xml_res_file_52, xml_res_size_52, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_32x32_27.png"), xml_res_file_53, xml_res_size_53, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$gray_32x32_27.png"), xml_res_file_54, xml_res_size_54, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_28.png"), xml_res_file_55, xml_res_size_55, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_29.png"), xml_res_file_56, xml_res_size_56, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_30.png"), xml_res_file_57, xml_res_size_57, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_31.png"), xml_res_file_58, xml_res_size_58, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_32.png"), xml_res_file_59, xml_res_size_59, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_33.png"), xml_res_file_60, xml_res_size_60, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_34.png"), xml_res_file_61, xml_res_size_61, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$color_24x24_36.png"), xml_res_file_62, xml_res_size_62, wxT("image/x-apple-ios-png")); XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$toolbar.xrc"), xml_res_file_63, xml_res_size_63, wxT("text/xml")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-open-folder.png"), xml_res_file_64, xml_res_size_64, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-open-folder_disabled.png"), xml_res_file_65, xml_res_size_65, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-close-folder.png"), xml_res_file_66, xml_res_size_66, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-close-folder_disabled.png"), xml_res_file_67, xml_res_size_67, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_36.png"), xml_res_file_68, xml_res_size_68, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_36_disabled.png"), xml_res_file_69, xml_res_size_69, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_2.png"), xml_res_file_70, xml_res_size_70, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_2_disabled.png"), xml_res_file_71, xml_res_size_71, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_4.png"), xml_res_file_72, xml_res_size_72, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_4_disabled.png"), xml_res_file_73, xml_res_size_73, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_5.png"), xml_res_file_74, xml_res_size_74, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_5_disabled.png"), xml_res_file_75, xml_res_size_75, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_6.png"), xml_res_file_76, xml_res_size_76, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_6_disabled.png"), xml_res_file_77, xml_res_size_77, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_9.png"), xml_res_file_78, xml_res_size_78, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_9_disabled.png"), xml_res_file_79, xml_res_size_79, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_10.png"), xml_res_file_80, xml_res_size_80, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_10_disabled.png"), xml_res_file_81, xml_res_size_81, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_14.png"), xml_res_file_82, xml_res_size_82, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_14_disabled.png"), xml_res_file_83, xml_res_size_83, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_12.png"), xml_res_file_84, xml_res_size_84, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_12_disabled.png"), xml_res_file_85, xml_res_size_85, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_13.png"), xml_res_file_86, xml_res_size_86, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_13_disabled.png"), xml_res_file_87, xml_res_size_87, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_15.png"), xml_res_file_88, xml_res_size_88, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_15_disabled.png"), xml_res_file_89, xml_res_size_89, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_17.png"), xml_res_file_90, xml_res_size_90, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_17_disabled.png"), xml_res_file_91, xml_res_size_91, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_16.png"), xml_res_file_92, xml_res_size_92, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_16_disabled.png"), xml_res_file_93, xml_res_size_93, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_18.png"), xml_res_file_94, xml_res_size_94, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_18_disabled.png"), xml_res_file_95, xml_res_size_95, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_19.png"), xml_res_file_96, xml_res_size_96, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_19_disabled.png"), xml_res_file_97, xml_res_size_97, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_20.png"), xml_res_file_98, xml_res_size_98, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_20_disabled.png"), xml_res_file_99, xml_res_size_99, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_21.png"), xml_res_file_100, xml_res_size_100, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_21_disabled.png"), xml_res_file_101, xml_res_size_101, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_22.png"), xml_res_file_102, xml_res_size_102, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_22_disabled.png"), xml_res_file_103, xml_res_size_103, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_23.png"), xml_res_file_104, xml_res_size_104, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_23_disabled.png"), xml_res_file_105, xml_res_size_105, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_24.png"), xml_res_file_106, xml_res_size_106, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_24_disabled.png"), xml_res_file_107, xml_res_size_107, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_25.png"), xml_res_file_108, xml_res_size_108, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_25_disabled.png"), xml_res_file_109, xml_res_size_109, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_26.png"), xml_res_file_110, xml_res_size_110, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_26_disabled.png"), xml_res_file_111, xml_res_size_111, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_27.png"), xml_res_file_112, xml_res_size_112, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_27_disabled.png"), xml_res_file_113, xml_res_size_113, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_28.png"), xml_res_file_114, xml_res_size_114, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_28_disabled.png"), xml_res_file_115, xml_res_size_115, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_29.png"), xml_res_file_116, xml_res_size_116, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_29_disabled.png"), xml_res_file_117, xml_res_size_117, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_30.png"), xml_res_file_118, xml_res_size_118, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_30_disabled.png"), xml_res_file_119, xml_res_size_119, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_31.png"), xml_res_file_120, xml_res_size_120, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_31_disabled.png"), xml_res_file_121, xml_res_size_121, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_32.png"), xml_res_file_122, xml_res_size_122, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_32_disabled.png"), xml_res_file_123, xml_res_size_123, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-open-folder.png"), xml_res_file_64, xml_res_size_64, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-open-folder_disabled.png"), xml_res_file_65, xml_res_size_65, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-close-folder.png"), xml_res_file_66, xml_res_size_66, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBar-close-folder_disabled.png"), xml_res_file_67, xml_res_size_67, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_36.png"), xml_res_file_68, xml_res_size_68, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_36_disabled.png"), xml_res_file_69, xml_res_size_69, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_2.png"), xml_res_file_70, xml_res_size_70, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_2_disabled.png"), xml_res_file_71, xml_res_size_71, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_4.png"), xml_res_file_72, xml_res_size_72, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_4_disabled.png"), xml_res_file_73, xml_res_size_73, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_5.png"), xml_res_file_74, xml_res_size_74, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_5_disabled.png"), xml_res_file_75, xml_res_size_75, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_6.png"), xml_res_file_76, xml_res_size_76, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_6_disabled.png"), xml_res_file_77, xml_res_size_77, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_9.png"), xml_res_file_78, xml_res_size_78, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_9_disabled.png"), xml_res_file_79, xml_res_size_79, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_10.png"), xml_res_file_80, xml_res_size_80, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_10_disabled.png"), xml_res_file_81, xml_res_size_81, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_14.png"), xml_res_file_82, xml_res_size_82, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_14_disabled.png"), xml_res_file_83, xml_res_size_83, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_12.png"), xml_res_file_84, xml_res_size_84, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_12_disabled.png"), xml_res_file_85, xml_res_size_85, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_13.png"), xml_res_file_86, xml_res_size_86, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_13_disabled.png"), xml_res_file_87, xml_res_size_87, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_15.png"), xml_res_file_88, xml_res_size_88, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_15_disabled.png"), xml_res_file_89, xml_res_size_89, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_17.png"), xml_res_file_90, xml_res_size_90, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_17_disabled.png"), xml_res_file_91, xml_res_size_91, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_16.png"), xml_res_file_92, xml_res_size_92, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_16_disabled.png"), xml_res_file_93, xml_res_size_93, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_18.png"), xml_res_file_94, xml_res_size_94, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_18_disabled.png"), xml_res_file_95, xml_res_size_95, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_19.png"), xml_res_file_96, xml_res_size_96, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_19_disabled.png"), xml_res_file_97, xml_res_size_97, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_20.png"), xml_res_file_98, xml_res_size_98, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_20_disabled.png"), xml_res_file_99, xml_res_size_99, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_21.png"), xml_res_file_100, xml_res_size_100, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_21_disabled.png"), xml_res_file_101, xml_res_size_101, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_22.png"), xml_res_file_102, xml_res_size_102, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_22_disabled.png"), xml_res_file_103, xml_res_size_103, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_23.png"), xml_res_file_104, xml_res_size_104, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_23_disabled.png"), xml_res_file_105, xml_res_size_105, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_24.png"), xml_res_file_106, xml_res_size_106, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_24_disabled.png"), xml_res_file_107, xml_res_size_107, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_25.png"), xml_res_file_108, xml_res_size_108, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_25_disabled.png"), xml_res_file_109, xml_res_size_109, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_26.png"), xml_res_file_110, xml_res_size_110, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_26_disabled.png"), xml_res_file_111, xml_res_size_111, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_27.png"), xml_res_file_112, xml_res_size_112, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_27_disabled.png"), xml_res_file_113, xml_res_size_113, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_28.png"), xml_res_file_114, xml_res_size_114, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_28_disabled.png"), xml_res_file_115, xml_res_size_115, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_29.png"), xml_res_file_116, xml_res_size_116, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_29_disabled.png"), xml_res_file_117, xml_res_size_117, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_30.png"), xml_res_file_118, xml_res_size_118, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_30_disabled.png"), xml_res_file_119, xml_res_size_119, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_31.png"), xml_res_file_120, xml_res_size_120, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_31_disabled.png"), xml_res_file_121, xml_res_size_121, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_32.png"), xml_res_file_122, xml_res_size_122, wxT("image/x-apple-ios-png")); + XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$ToolBarBitmaps_32_disabled.png"), xml_res_file_123, xml_res_size_123, wxT("image/x-apple-ios-png")); XRC_ADD_FILE(wxT("XRC_resource/GdaAppResources.cpp$panel.xrc"), xml_res_file_124, xml_res_size_124, wxT("text/xml")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$dialogs.xrc")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/GdaAppResources.cpp$data_viewer_dialogs.xrc"));