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

Merge wxQT branch into the trunk.

Browse Source 
This merges in the latest sources from GSoC 2014 wxQt project with just a few
minor corrections, mostly undoing wrong changes to common files in that branch
(results of a previous bad merge?) and getting rid of whitespace-only changes.
Also remove debug logging from wxGrid.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-08-24 01:50:11 +00:00
parent d513d3e2f0
commit df13791078
381 changed files with 24333 additions and 938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/opengl/cube/Makefile.in
View File

@@ -36,6 +36,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
CXXWARNINGS = @CXXWARNINGS@
HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
wx_top_builddir = @wx_top_builddir@
### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
CUBE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
CUBE_OBJECTS = \
$(__cube___win32rc) \
cube_cube.o

3
samples/opengl/isosurf/Makefile.in
View File

@@ -36,6 +36,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
CXXWARNINGS = @CXXWARNINGS@
HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
wx_top_builddir = @wx_top_builddir@
### Variables: ###
@@ -47,7 +48,7 @@ LIBDIRNAME = $(wx_top_builddir)/lib
ISOSURF_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
ISOSURF_OBJECTS = \
$(__isosurf___win32rc) \
isosurf_isosurf.o

2
samples/opengl/isosurf/isosurf.cpp
View File

@@ -118,7 +118,7 @@ MyFrame::MyFrame(wxFrame *frame, const wxString& title, const wxPoint& pos,
{ WX_GL_RGBA, WX_GL_MIN_RED, 1, WX_GL_MIN_GREEN, 1,
WX_GL_MIN_BLUE, 1, WX_GL_DEPTH_SIZE, 1,
WX_GL_DOUBLEBUFFER,
# if defined(__WXMAC__)
# if defined(__WXMAC__) || defined(__WXQT__)
GL_NONE };
# else
None };

3
samples/opengl/penguin/Makefile.in
View File

@@ -38,6 +38,7 @@ EXTRALIBS_OPENGL = @EXTRALIBS_OPENGL@
CXXWARNINGS = @CXXWARNINGS@
HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_CXXFLAGS = @SAMPLES_CXXFLAGS@
wx_top_builddir = @wx_top_builddir@
### Variables: ###
@@ -53,7 +54,7 @@ PENGUIN_CFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
PENGUIN_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CXXWARNINGS) \
$(CPPFLAGS) $(CXXFLAGS)
$(SAMPLES_CXXFLAGS) $(CPPFLAGS) $(CXXFLAGS)
PENGUIN_OBJECTS = \
$(__penguin___win32rc) \
penguin_penguin.o \