Merge pull request #32 from guanlisheng/upgrade2v4

HiDPI adoption

CMakeLists.txt

@@ -82,6 +82,7 @@ target_include_directories(${PROJECT_NAME} PUBLIC src)
 
 if(APPLE)
     set_target_properties(${PROJECT_NAME} PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/build/Info.plist.in
         RESOURCE "build/wxmac.icns"
         MACOSX_BUNDLE_ICON_FILE wxmac.icns
         MACOSX_BUNDLE_COPYRIGHT "Copyright wxWidgets"

build/Info.plist.in

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
 <dict>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.wxwindows.IDENTIFIER</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+	<key>CFBundleGetInfoString</key>
+	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
 	<key>CFBundleIconFile</key>
-	<string>wxmac.icns</string>
+	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
+	<key>CFBundleIdentifier</key>
+	<string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleLongVersionString</key>
+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
 	<key>CFBundleName</key>
-	<string>EXECUTABLE</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>VERSION</string>
-	<key>CFBundleShortVersionString</key>
-	<string>VERSION</string>
-	<key>CFBundleGetInfoString</key>
-	<string>EXECUTABLE version VERSION, (c) 2002-2006 wxWidgets</string>
-	<key>CFBundleLongVersionString</key>
-	<string>VERSION, (c) 2002-2006 wxWidgets</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2002-2006 wxWidgets</string>
-	<key>LSRequiresCarbon</key>
-	<true/>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
 </dict>
 </plist>

src/indexbook.cpp

@@ -114,12 +114,12 @@ void wxIndexBook::CreateControls()
     m_PageColumns->SetDefaultRowSize(25);
     m_PageColumns->SetColLabelSize(25);
 
-    wxBitmap m_PageColumnsBitmap(wxGetApp().GetBmp(ID_BMP_FIELD));
+    wxBitmapBundle m_PageColumnsBitmap(wxGetApp().GetBmp(ID_BMP_FIELD));
     noteBook->AddPage(m_PageColumns, _("Columns"), false, m_PageColumnsBitmap);
 
     m_PageDdl = new wxDDLEditor(noteBook, ID_PAGEDDL);
 
-    wxBitmap m_PageDdlBitmap(wxGetApp().GetBmp(ID_BMP_RUNSCRIPT));
+    wxBitmapBundle m_PageDdlBitmap(wxGetApp().GetBmp(ID_BMP_RUNSCRIPT));
     noteBook->AddPage(m_PageDdl, _("DDL"), false, m_PageDdlBitmap);
 
     bSizer->Add(noteBook, 1, wxGROW, 0);

src/paneldata.cpp

@@ -109,13 +109,13 @@ void wxPanelData::CreateControls()
     wxToolBar* iToolBar1 = new wxToolBar(this, ID_DATATOOLBAR, wxDefaultPosition,
                                          wxDefaultSize,
                                          wxTB_FLAT|wxTB_HORIZONTAL|wxTB_NODIVIDER);
-    wxBitmap filterBmp(wxGetApp().GetBmp(ID_BMP_FILTER));
+    wxBitmapBundle filterBmp(wxGetApp().GetBmp(ID_BMP_FILTER));
     iToolBar1->AddTool(ID_MNU_FILTER, _("Filter"), filterBmp, BitmapDisabled,
                        wxITEM_NORMAL, _("Filter"), _("Filter"));
-    wxBitmap sortBmp(wxGetApp().GetBmp(ID_BMP_SORT));
+    wxBitmapBundle sortBmp(wxGetApp().GetBmp(ID_BMP_SORT));
     iToolBar1->AddTool(ID_MNU_SORT, _("Sort"), sortBmp, BitmapDisabled,
                        wxITEM_NORMAL, _("Sort"), _("Sort"));
-    wxBitmap refreshBmp(wxGetApp().GetBmp(ID_BMP_REFRESH));
+    wxBitmapBundle refreshBmp(wxGetApp().GetBmp(ID_BMP_REFRESH));
     iToolBar1->AddTool(ID_MNU_REFRESH, _("Refresh"), refreshBmp, BitmapDisabled,
                        wxITEM_NORMAL, _("Refresh"), _("Refresh"));
     iToolBar1->AddSeparator();