diff --git a/BuildTools/ubuntu/GNUmakefile b/BuildTools/ubuntu/GNUmakefile index 150ef6809..b0b2f6a90 100644 --- a/BuildTools/ubuntu/GNUmakefile +++ b/BuildTools/ubuntu/GNUmakefile @@ -72,11 +72,11 @@ build-geoda-mac: cp $(GEODA_HOME)/libraries/lib/libproj.so.0.7.0 build/plugins/libproj.so.0 cp $(GEODA_HOME)/libraries/lib/libgeos_c.so.1.7.8 build/plugins/libgeos_c.so.1 cp $(GEODA_HOME)/libraries/lib/libsqlite3.so.0.8.6 build/plugins/libsqlite3.so.0 - cp $(GEODA_HOME)/libraries/lib/libiconv.so.2.5.0 build/plugins/libiconv.so.2 + cp $(GEODA_HOME)/libraries/lib/libiconv.so.2.5.1 build/plugins/libiconv.so.2 chmod +x build/plugins/libiconv.so.2 cp $(GEODA_HOME)/libraries/lib/libminizip.so.0.0.0 build/plugins/libminizip.so.0 cp $(GEODA_HOME)/libraries/lib/liburiparser.so.1.0.5 build/plugins/liburiparser.so.1 - cp $(GEODA_HOME)/libraries/lib/libgeos-3.3.8.so build/plugins/ + cp $(GEODA_HOME)/libraries/lib/libgeos-3.3.8.so build/plugins/libgeos-3.3.8.so cp libraries/share/gdal/* build/gdaldata clean: diff --git a/BuildTools/ubuntu/build.sh b/BuildTools/ubuntu/build.sh index 7de38d75b..8802998ff 100755 --- a/BuildTools/ubuntu/build.sh +++ b/BuildTools/ubuntu/build.sh @@ -131,9 +131,21 @@ echo "%%%%%%%%%%%%%%%%%%%%%%" fi } + +######################################################################### +# install c-ares -- for cURL, prevent crash on Mac oSx with threads +######################################################################### +install_library c-ares-1.10.0 http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz libcares.a + + + ######################################################################### # install cURL ######################################################################### +echo "" +echo "%%%%%%%%%%%%%%%%%%%%%%" +echo "% Building: cURL%" +echo "%%%%%%%%%%%%%%%%%%%%%%" LIB_NAME=curl-7.46.0 LIB_CHECKER=libcurl.a @@ -311,7 +323,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%" { LIB_NAME=libspatialite-4.0.0 LIB_URL=https://dl.dropboxusercontent.com/u/145979/geoda_libraries/libspatialite-4.0.0.tar.gz - LIB_FILENAME=$(basename "$LIB_URL" ".tar.gz") + LIB_FILENAME=$LIB_NAME.tar.gz LIB_CHECKER=libspatialite.a echo $LIB_FILENAME @@ -437,7 +449,7 @@ echo $LIB_FILENAME cd $DOWNLOAD_HOME if ! [ -d "$LIB_NAME" ]; then - curl -o https://dl.dropboxusercontent.com/u/145979/geoda_libraries/json_spirit_v4.08.zip + curl -O https://dl.dropboxusercontent.com/u/145979/geoda_libraries/json_spirit_v4.08.zip unzip $LIB_FILENAME fi @@ -569,7 +581,7 @@ echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" ./configure cp -rf $GEODA_HOME/dep/gdal-1.9.2/* . cp GDALmake.opt GDALmake.opt - #make clean + make clean $MAKER make install #cd ogr/ogrsf_frmts/oci diff --git a/Explore/LineChartView.cpp b/Explore/LineChartView.cpp index 7ef3a06e3..5d1ffd309 100644 --- a/Explore/LineChartView.cpp +++ b/Explore/LineChartView.cpp @@ -1056,7 +1056,7 @@ void LineChartFrame::OnSaveDummyTable(wxCommandEvent& event) wxString col_name(var_man.GetName(i)); int n = var_stack_array[i].size(); if (mem_table_int == NULL) mem_table_int = new OGRTable(n); - OGRColumn* var_col = new OGRColumnDouble(col_name, 18, -1, n); + OGRColumn* var_col = new OGRColumnDouble(col_name, 18, 9, n); var_col->UpdateData(var_stack_array[i]); mem_table_int->AddOGRColumn(var_col); } diff --git a/TemplateCanvas.cpp b/TemplateCanvas.cpp index 98ca5ba10..16cf019d4 100644 --- a/TemplateCanvas.cpp +++ b/TemplateCanvas.cpp @@ -495,8 +495,8 @@ void TemplateCanvas::ResizeSelectableShps(int virtual_scrn_w, int offset_vs_x = (int)(whole_vs_w * (map_topleft.x-ext_shps_orig_xmin) / shp_w); int offset_vs_y = (int)(whole_vs_h * (ext_shps_orig_ymax-map_topleft.y) / shp_h); - SetVirtualSize(whole_vs_w, whole_vs_h); - SetScrollRate(1,1); + //SetVirtualSize(whole_vs_w, whole_vs_h); + //SetScrollRate(1,1); prev_scroll_pos_x = offset_vs_x > 0 ? offset_vs_x:0; prev_scroll_pos_y = offset_vs_y > 0 ? offset_vs_y:0; //SetScrollPos(wxHORIZONTAL, prev_scroll_pos_x); @@ -522,7 +522,7 @@ void TemplateCanvas::ResetShapes() int vs_w=0, vs_h=0; GetClientSize(&vs_w, &vs_h); - SetVirtualSize(vs_w, vs_h); + //SetVirtualSize(vs_w, vs_h); //SetScrollbars(1, 1, vs_w, vs_h, 0, 0, true); SetMouseMode(select); @@ -1146,15 +1146,18 @@ void TemplateCanvas::DrawSelectableShapes_gc(wxMemoryDC &dc) } //gc->SetBrush(cat_data.GetCategoryBrush(cc_ts, cat)); std::vector& ids = cat_data.GetIdsRef(cc_ts, cat); + + wxGraphicsPath path = gc->CreatePath(); for (int i=0, iend=ids.size(); iisNull()) continue; - wxGraphicsPath path = gc->CreatePath(); + path.AddCircle(p->center.x, p->center.y, r); - gc->StrokePath(path); - } + + } + gc->StrokePath(path); } } else if (selectable_shps_type == polygons) { int dirty_cnt = 0; diff --git a/rc/GdaAppResources.cpp b/rc/GdaAppResources.cpp index 97c7be327..cc92827ba 100644 --- a/rc/GdaAppResources.cpp +++ b/rc/GdaAppResources.cpp @@ -12085,7 +12085,7 @@ static unsigned char xml_res_file_6[] = { 32,32,32,32,32,32,32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115, 115,61,34,119,120,83,116,97,116,105,99,84,101,120,116,34,62,10,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101, -108,62,86,97,114,105,97,108,98,101,32,78,97,109,101,60,47,108,97,98,101, +108,62,86,97,114,105,97,98,108,101,32,78,97,109,101,60,47,108,97,98,101, 108,62,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, 32,60,115,105,122,101,62,54,48,44,45,49,100,60,47,115,105,122,101,62,10, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98, @@ -12440,7 +12440,7 @@ static unsigned char xml_res_file_6[] = { 32,32,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120, 83,116,97,116,105,99,84,101,120,116,34,62,10,32,32,32,32,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,60,108,97,98,101,108,62,86,97,114, -105,97,108,98,101,32,78,97,109,101,60,47,108,97,98,101,108,62,10,32,32, +105,97,98,108,101,32,78,97,109,101,60,47,108,97,98,101,108,62,10,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,115,105, 122,101,62,54,48,44,45,49,100,60,47,115,105,122,101,62,10,32,32,32,32,32, 32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,47,111,98,106,101,99,116, @@ -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/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$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$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/x-apple-ios-png")); + 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$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/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$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$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/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$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$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")); diff --git a/rc/dialogs.xrc b/rc/dialogs.xrc index 4ecb9b92e..13dac2650 100644 --- a/rc/dialogs.xrc +++ b/rc/dialogs.xrc @@ -5649,7 +5649,7 @@ - + 60,-1d wxALIGN_CENTRE_VERTICAL @@ -5847,7 +5847,7 @@ - + 60,-1d wxALIGN_CENTRE_VERTICAL diff --git a/version.h b/version.h index 5b5056906..25467927d 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ namespace Gda { const int version_major = 1; const int version_minor = 8; - const int version_build = 0; + const int version_build = 2; const int version_year = 2016; const int version_month = 4; - const int version_day = 18; + const int version_day = 26; const int version_night = 0; const int version_type = 1; // 0: alpha, 1: beta, 2: release }