From 2e56f1a8d357eb48467d565b36ad0d68572d9dce Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 20 Oct 2020 20:38:01 +0200 Subject: [PATCH 1/8] Remove more BCC-specific hdrstop pragma --- src/osx/cocoa/activityindicator.mm | 3 --- src/osx/cocoa/datetimectrl.mm | 3 --- src/osx/cocoa/evtloop.mm | 3 --- src/osx/cocoa/glcanvas.mm | 3 --- src/osx/cocoa/mediactrl.mm | 3 --- src/osx/cocoa/nativewin.mm | 3 --- src/osx/cocoa/notifmsg.mm | 3 --- src/osx/cocoa/overlay.mm | 3 --- src/osx/cocoa/preferences.mm | 3 --- src/osx/cocoa/srchctrl.mm | 3 --- src/osx/cocoa/statbmp.mm | 3 --- src/osx/cocoa/statline.mm | 3 --- src/osx/iphone/evtloop.mm | 3 --- src/osx/iphone/glcanvas.mm | 3 --- src/osx/iphone/statbmp.mm | 3 --- src/richtext/richtextdialogs.pjd | 3 --- src/stc/stc.cpp.in | 3 --- 17 files changed, 51 deletions(-) diff --git a/src/osx/cocoa/activityindicator.mm b/src/osx/cocoa/activityindicator.mm index dd4cfa4195..ac79ffae84 100644 --- a/src/osx/cocoa/activityindicator.mm +++ b/src/osx/cocoa/activityindicator.mm @@ -18,9 +18,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #if wxUSE_ACTIVITYINDICATOR diff --git a/src/osx/cocoa/datetimectrl.mm b/src/osx/cocoa/datetimectrl.mm index 19ca20989b..3157bc21c8 100644 --- a/src/osx/cocoa/datetimectrl.mm +++ b/src/osx/cocoa/datetimectrl.mm @@ -18,9 +18,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #if wxUSE_DATEPICKCTRL diff --git a/src/osx/cocoa/evtloop.mm b/src/osx/cocoa/evtloop.mm index fe45a40cf2..f99d09661d 100644 --- a/src/osx/cocoa/evtloop.mm +++ b/src/osx/cocoa/evtloop.mm @@ -19,9 +19,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #include "wx/evtloop.h" diff --git a/src/osx/cocoa/glcanvas.mm b/src/osx/cocoa/glcanvas.mm index 505b3a5e4b..f6bff5b1fb 100644 --- a/src/osx/cocoa/glcanvas.mm +++ b/src/osx/cocoa/glcanvas.mm @@ -18,9 +18,6 @@ #include "wx/wxprec.h" -#if defined(__BORLANDC__) - #pragma hdrstop -#endif #if wxUSE_GLCANVAS diff --git a/src/osx/cocoa/mediactrl.mm b/src/osx/cocoa/mediactrl.mm index fbeafe201b..65efa33089 100644 --- a/src/osx/cocoa/mediactrl.mm +++ b/src/osx/cocoa/mediactrl.mm @@ -19,9 +19,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif //--------------------------------------------------------------------------- // Compilation guard diff --git a/src/osx/cocoa/nativewin.mm b/src/osx/cocoa/nativewin.mm index 82dc4775d1..315dd1d562 100644 --- a/src/osx/cocoa/nativewin.mm +++ b/src/osx/cocoa/nativewin.mm @@ -18,9 +18,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #include "wx/nativewin.h" diff --git a/src/osx/cocoa/notifmsg.mm b/src/osx/cocoa/notifmsg.mm index 2ef3fc8e67..8828aed52c 100644 --- a/src/osx/cocoa/notifmsg.mm +++ b/src/osx/cocoa/notifmsg.mm @@ -18,9 +18,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #include "wx/notifmsg.h" diff --git a/src/osx/cocoa/overlay.mm b/src/osx/cocoa/overlay.mm index 6114d31e0a..6aa2211bca 100644 --- a/src/osx/cocoa/overlay.mm +++ b/src/osx/cocoa/overlay.mm @@ -19,9 +19,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #include "wx/overlay.h" diff --git a/src/osx/cocoa/preferences.mm b/src/osx/cocoa/preferences.mm index 6cb962cdbf..63e6eaf9a5 100644 --- a/src/osx/cocoa/preferences.mm +++ b/src/osx/cocoa/preferences.mm @@ -18,9 +18,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #if wxUSE_PREFERENCES_EDITOR diff --git a/src/osx/cocoa/srchctrl.mm b/src/osx/cocoa/srchctrl.mm index 7cf1695285..b556179e69 100644 --- a/src/osx/cocoa/srchctrl.mm +++ b/src/osx/cocoa/srchctrl.mm @@ -10,9 +10,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #if wxUSE_SEARCHCTRL diff --git a/src/osx/cocoa/statbmp.mm b/src/osx/cocoa/statbmp.mm index 20fd645f7c..9ad43cf4e4 100644 --- a/src/osx/cocoa/statbmp.mm +++ b/src/osx/cocoa/statbmp.mm @@ -18,9 +18,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif #if wxUSE_STATBMP diff --git a/src/osx/cocoa/statline.mm b/src/osx/cocoa/statline.mm index 8590d36740..fcee93be62 100644 --- a/src/osx/cocoa/statline.mm +++ b/src/osx/cocoa/statline.mm @@ -18,9 +18,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #if wxUSE_STATLINE diff --git a/src/osx/iphone/evtloop.mm b/src/osx/iphone/evtloop.mm index 8c51b1c348..7e0c695570 100644 --- a/src/osx/iphone/evtloop.mm +++ b/src/osx/iphone/evtloop.mm @@ -19,9 +19,6 @@ // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #include "wx/evtloop.h" diff --git a/src/osx/iphone/glcanvas.mm b/src/osx/iphone/glcanvas.mm index d5125c0086..158edf42ce 100644 --- a/src/osx/iphone/glcanvas.mm +++ b/src/osx/iphone/glcanvas.mm @@ -18,9 +18,6 @@ #include "wx/wxprec.h" -#if defined(__BORLANDC__) - #pragma hdrstop -#endif #if wxUSE_GLCANVAS diff --git a/src/osx/iphone/statbmp.mm b/src/osx/iphone/statbmp.mm index a1095a04a9..0c89368e84 100644 --- a/src/osx/iphone/statbmp.mm +++ b/src/osx/iphone/statbmp.mm @@ -18,9 +18,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif #if wxUSE_STATBMP diff --git a/src/richtext/richtextdialogs.pjd b/src/richtext/richtextdialogs.pjd index 353af82f62..889583767a 100644 --- a/src/richtext/richtextdialogs.pjd +++ b/src/richtext/richtextdialogs.pjd @@ -66,9 +66,6 @@ "// For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ -#pragma hdrstop -#endif #ifndef WX_PRECOMP #include "wx/wx.h" diff --git a/src/stc/stc.cpp.in b/src/stc/stc.cpp.in index a3987c47fe..81b5c7bf3f 100644 --- a/src/stc/stc.cpp.in +++ b/src/stc/stc.cpp.in @@ -28,9 +28,6 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#ifdef __BORLANDC__ - #pragma hdrstop -#endif #if wxUSE_STC From 1d6a6b934f350663d9896cc5e7e1db8c1ed12e55 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 20 Oct 2020 20:38:30 +0200 Subject: [PATCH 2/8] Remove a borland check --- samples/nativdlg/dialog1.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/nativdlg/dialog1.rc b/samples/nativdlg/dialog1.rc index 3b008e6421..76fb2c7948 100644 --- a/samples/nativdlg/dialog1.rc +++ b/samples/nativdlg/dialog1.rc @@ -21,7 +21,7 @@ #include "resource.h" -#if !defined(__GNUWIN32__) && !defined(__BORLANDC__) +#if !defined(__GNUWIN32__) #include #endif From b1653024d63cb8aeb7654c5be6190cb20854196f Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 20 Oct 2020 20:39:05 +0200 Subject: [PATCH 3/8] CMake: remove HAVE_VARIADIC_MACROS check --- build/cmake/setup.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/build/cmake/setup.cmake b/build/cmake/setup.cmake index 18556f077a..4360634ddd 100644 --- a/build/cmake/setup.cmake +++ b/build/cmake/setup.cmake @@ -132,13 +132,6 @@ if(NOT MSVC) endif() endif() -wx_check_c_source_compiles( - "#define test(fmt, ...) printf(fmt, __VA_ARGS__) - test(\"%s %d %p\", \"test\", 1, 0);" - HAVE_VARIADIC_MACROS - stdio.h - ) -#TODO: wxNO_VARIADIC_MACROS if(wxUSE_STL AND CMAKE_CXX_STANDARD EQUAL 98) wx_check_cxx_source_compiles(" std::vector moo; From badf0eb64eed2ba581d34c2f95208d70b565bab8 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Tue, 20 Oct 2020 20:40:50 +0200 Subject: [PATCH 4/8] CMake: add image test files --- build/cmake/tests/gui/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build/cmake/tests/gui/CMakeLists.txt b/build/cmake/tests/gui/CMakeLists.txt index 61cc082cc6..91ba5faffb 100644 --- a/build/cmake/tests/gui/CMakeLists.txt +++ b/build/cmake/tests/gui/CMakeLists.txt @@ -164,6 +164,15 @@ set(TEST_GUI_DATA image/horse_box_average_100x100.png image/horse_box_average_150x150.png image/horse_box_average_300x300.png + image/paste_input_background.png + image/paste_input_black.png + image/paste_input_overlay_transparent_border_opaque_square.png + image/paste_input_overlay_transparent_border_semitransparent_circle.png + image/paste_input_overlay_transparent_border_semitransparent_square.png + image/paste_result_background_plus_circle_plus_square.png + image/paste_result_background_plus_overlay_transparent_border_opaque_square.png + image/paste_result_background_plus_overlay_transparent_border_semitransparent_square.png + image/paste_result_no_background_square_over_circle.png intl/ja/internat.mo intl/ja/internat.po ) From 1a2d81354eb3ca3314ca0cdc45dc9f6dca569d1e Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 21 Oct 2020 00:52:20 +0200 Subject: [PATCH 5/8] Don't call SetupColours when loading a native dialog It makes everything grey. --- src/msw/nativdlg.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/msw/nativdlg.cpp b/src/msw/nativdlg.cpp index ecfde39fbb..a5d359ec60 100644 --- a/src/msw/nativdlg.cpp +++ b/src/msw/nativdlg.cpp @@ -300,7 +300,6 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd) parent->AddChild(win); win->SubclassWin(hWnd); win->AdoptAttributesFromHWND(); - win->SetupColours(); } return win; From a942dc8a76c557d52023dd2b83ebafc298da1570 Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 21 Oct 2020 00:54:28 +0200 Subject: [PATCH 6/8] Remove hard-coded size and position in native dialog sample --- samples/nativdlg/nativdlg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp index 9b8551ef65..7740b6299a 100644 --- a/samples/nativdlg/nativdlg.cpp +++ b/samples/nativdlg/nativdlg.cpp @@ -39,7 +39,7 @@ bool MyApp::OnInit(void) return false; // Create the main frame window - MyFrame *frame = new MyFrame(NULL, wxID_ANY, "wxWidgets Native Dialog Sample", wxPoint(0, 0), wxSize(300, 250)); + MyFrame *frame = new MyFrame(NULL, wxID_ANY, "wxWidgets Native Dialog Sample", wxDefaultPosition, wxDefaultSize); #if wxUSE_STATUSBAR // Give it a status line @@ -60,7 +60,7 @@ bool MyApp::OnInit(void) frame->SetMenuBar(menu_bar); // Make a panel - frame->panel = new wxWindow(frame, wxID_ANY, wxPoint(0, 0), wxSize(400, 400), 0, "MyMainFrame"); + frame->panel = new wxWindow(frame, wxID_ANY); frame->Show(true); return true; From c2819c8d3862ec44d16ec09b3cb2360f8b20b31c Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 21 Oct 2020 00:57:42 +0200 Subject: [PATCH 7/8] Update indentation in native dialog sample --- samples/nativdlg/nativdlg.cpp | 50 +++++++++++++++++------------------ samples/nativdlg/nativdlg.h | 20 +++++++------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/samples/nativdlg/nativdlg.cpp b/samples/nativdlg/nativdlg.cpp index 7740b6299a..088a5a7d2b 100644 --- a/samples/nativdlg/nativdlg.cpp +++ b/samples/nativdlg/nativdlg.cpp @@ -35,45 +35,45 @@ wxIMPLEMENT_APP(MyApp); bool MyApp::OnInit(void) { - if ( !wxApp::OnInit() ) - return false; + if ( !wxApp::OnInit() ) + return false; - // Create the main frame window - MyFrame *frame = new MyFrame(NULL, wxID_ANY, "wxWidgets Native Dialog Sample", wxDefaultPosition, wxDefaultSize); + // Create the main frame window + MyFrame* frame = new MyFrame(NULL, wxID_ANY, "wxWidgets Native Dialog Sample", wxDefaultPosition, wxDefaultSize); #if wxUSE_STATUSBAR - // Give it a status line - frame->CreateStatusBar(2); + // Give it a status line + frame->CreateStatusBar(2); #endif // wxUSE_STATUSBAR - // Make a menubar - wxMenu *file_menu = new wxMenu; + // Make a menubar + wxMenu* file_menu = new wxMenu; - file_menu->Append(RESOURCE_TEST1, "&Dialog box test", "Test dialog box resource"); - file_menu->Append(RESOURCE_QUIT, "E&xit", "Quit program"); + file_menu->Append(RESOURCE_TEST1, "&Dialog box test", "Test dialog box resource"); + file_menu->Append(RESOURCE_QUIT, "E&xit", "Quit program"); - wxMenuBar *menu_bar = new wxMenuBar; + wxMenuBar* menu_bar = new wxMenuBar; - menu_bar->Append(file_menu, "&File"); + menu_bar->Append(file_menu, "&File"); - // Associate the menu bar with the frame - frame->SetMenuBar(menu_bar); + // Associate the menu bar with the frame + frame->SetMenuBar(menu_bar); - // Make a panel - frame->panel = new wxWindow(frame, wxID_ANY); - frame->Show(true); + // Make a panel + frame->panel = new wxWindow(frame, wxID_ANY); + frame->Show(true); - return true; + return true; } wxBEGIN_EVENT_TABLE(MyFrame, wxFrame) - EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit) - EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1) +EVT_MENU(RESOURCE_QUIT, MyFrame::OnQuit) +EVT_MENU(RESOURCE_TEST1, MyFrame::OnTest1) wxEND_EVENT_TABLE() // Define my frame constructor -MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size): - wxFrame(parent, id, title, pos, size) +MyFrame::MyFrame(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size) : + wxFrame(parent, id, title, pos, size) { SetIcon(wxICON(sample)); @@ -82,19 +82,19 @@ MyFrame::MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, c void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { - Close(true); + Close(true); } void MyFrame::OnTest1(wxCommandEvent& WXUNUSED(event)) { #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) MyDialog dialog; - if (dialog.LoadNativeDialog(this, "dialog1")) + if ( dialog.LoadNativeDialog(this, "dialog1") ) { dialog.ShowModal(); } #else - wxMessageBox("No native dialog support","Platform limitation"); + wxMessageBox("No native dialog support", "Platform limitation"); #endif } diff --git a/samples/nativdlg/nativdlg.h b/samples/nativdlg/nativdlg.h index 732f881704..bedc78786f 100644 --- a/samples/nativdlg/nativdlg.h +++ b/samples/nativdlg/nativdlg.h @@ -9,31 +9,31 @@ ///////////////////////////////////////////////////////////////////////////// // Define a new application -class MyApp: public wxApp +class MyApp : public wxApp { - public: - MyApp(void){} +public: + MyApp(void) {} bool OnInit(void) wxOVERRIDE; }; -class MyFrame: public wxFrame +class MyFrame : public wxFrame { - public: - wxWindow *panel; - MyFrame(wxWindow *parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size); +public: + wxWindow* panel; + MyFrame(wxWindow* parent, const wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size); void OnQuit(wxCommandEvent& event); void OnTest1(wxCommandEvent& event); - wxDECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; class MyDialog : public wxDialog { - public: +public: void OnOk(wxCommandEvent& event); void OnCancel(wxCommandEvent& event); - wxDECLARE_EVENT_TABLE(); + wxDECLARE_EVENT_TABLE(); }; #define RESOURCE_QUIT 4 From 6a579ce34d51384629932114bf05494387354c5a Mon Sep 17 00:00:00 2001 From: Maarten Bent Date: Wed, 21 Oct 2020 01:00:31 +0200 Subject: [PATCH 8/8] Include windows.h in native dialog sample resource file Get rid of compiler specific include. --- samples/nativdlg/dialog1.rc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/samples/nativdlg/dialog1.rc b/samples/nativdlg/dialog1.rc index 76fb2c7948..96a294792c 100644 --- a/samples/nativdlg/dialog1.rc +++ b/samples/nativdlg/dialog1.rc @@ -20,10 +20,7 @@ #define wxID_NO 5104 #include "resource.h" - -#if !defined(__GNUWIN32__) -#include -#endif +#include #define APSTUDIO_READONLY_SYMBOLS /////////////////////////////////////////////////////////////////////////////