Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'misc-changes' of https://github.com/MaartenBent/wxWidgets

Browse Source 
Update CMake with recent changes, remove more Borland checks.

See https://github.com/wxWidgets/wxWidgets/pull/2098
This commit is contained in:
Vadim Zeitlin
2020-10-31 16:30:29 +01:00
parent 312a760029 6a579ce34d
commit a64348f3e4
23 changed files with 45 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/cmake/setup.cmake
View File

@@ -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<int> moo;

9
build/cmake/tests/gui/CMakeLists.txt
View File

@@ -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
)

5
samples/nativdlg/dialog1.rc
View File

@@ -20,10 +20,7 @@
#define wxID_NO 5104
#include "resource.h"
#if !defined(__GNUWIN32__) && !defined(__BORLANDC__)
#include <commctrl.h>
#endif
#include <windows.h>
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////

50
samples/nativdlg/nativdlg.cpp
View File

@@ -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", wxPoint(0, 0), wxSize(300, 250));
// 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, wxPoint(0, 0), wxSize(400, 400), 0, "MyMainFrame");
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
}

20
samples/nativdlg/nativdlg.h
View File

@@ -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

1
src/msw/nativdlg.cpp
View File

@@ -300,7 +300,6 @@ wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
parent->AddChild(win);
win->SubclassWin(hWnd);
win->AdoptAttributesFromHWND();
win->SetupColours();
}
return win;

3
src/osx/cocoa/activityindicator.mm
View File

@@ -18,9 +18,6 @@
// for compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_ACTIVITYINDICATOR

3
src/osx/cocoa/datetimectrl.mm
View File

@@ -18,9 +18,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_DATEPICKCTRL

3
src/osx/cocoa/evtloop.mm
View File

@@ -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"

3
src/osx/cocoa/glcanvas.mm
View File

@@ -18,9 +18,6 @@
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
#pragma hdrstop
#endif
#if wxUSE_GLCANVAS

3
src/osx/cocoa/mediactrl.mm
View File

@@ -19,9 +19,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
//---------------------------------------------------------------------------
// Compilation guard

3
src/osx/cocoa/nativewin.mm
View File

@@ -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"

3
src/osx/cocoa/notifmsg.mm
View File

@@ -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"

3
src/osx/cocoa/overlay.mm
View File

@@ -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"

3
src/osx/cocoa/preferences.mm
View File

@@ -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

3
src/osx/cocoa/srchctrl.mm
View File

@@ -10,9 +10,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_SEARCHCTRL

3
src/osx/cocoa/statbmp.mm
View File

@@ -18,9 +18,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_STATBMP

3
src/osx/cocoa/statline.mm
View File

@@ -18,9 +18,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_STATLINE

3
src/osx/iphone/evtloop.mm
View File

@@ -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"

3
src/osx/iphone/glcanvas.mm
View File

@@ -18,9 +18,6 @@
#include "wx/wxprec.h"
#if defined(__BORLANDC__)
#pragma hdrstop
#endif
#if wxUSE_GLCANVAS

3
src/osx/iphone/statbmp.mm
View File

@@ -18,9 +18,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_STATBMP

3
src/richtext/richtextdialogs.pjd
View File

@@ -66,9 +66,6 @@
<string name="cpp_implementation_preamble">"// For compilers that support precompilation, includes &quot;wx/wx.h&quot;.
#include &quot;wx/wxprec.h&quot;
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#ifndef WX_PRECOMP
#include &quot;wx/wx.h&quot;

3
src/stc/stc.cpp.in
View File

@@ -28,9 +28,6 @@
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#endif
#if wxUSE_STC