Only use Unix/X11-specific files under Unix in wxGTK.

No real changes for now, this is another commit in preparation for wxGTK under
MSW support.

Closes #14394.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-06-12 21:42:15 +00:00
parent adb783cc0a
commit 3dd3049516
4 changed files with 10037 additions and 25116 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -548,6 +548,18 @@ dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../demos/bombs/bombs.bkl,../../de
COND_PLATFORM_UNIX_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_UNIX_1_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then

View File

@@ -1044,8 +1044,14 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- wxGTK -->
<!-- ====================================================================== -->
<set var="GTK_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_SRC)</if>
</set>
<set var="GTK_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(XWIN_LOWLEVEL_HDR)</if>
</set>
<set var="GTK_LOWLEVEL_SRC" hints="files">
$(XWIN_LOWLEVEL_SRC)
$(GTK_PLATFORM_SRC)
src/generic/icon.cpp
src/generic/paletteg.cpp
src/gtk/app.cpp
@@ -1082,7 +1088,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/gtk/window.cpp
</set>
<set var="GTK_LOWLEVEL_HDR" hints="files">
$(XWIN_LOWLEVEL_HDR)
$(GTK_PLATFORM_HDR)
wx/generic/icon.h
wx/generic/paletteg.h
wx/gtk/app.h
@@ -3103,12 +3109,20 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/generic/animate.h
</set>
<set var="ADVANCED_GTK_PLATFORM_SRC" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_SRC)</if>
</set>
<set var="ADVANCED_GTK_PLATFORM_HDR" hints="files">
<if cond="PLATFORM_UNIX=='1'">$(ADVANCED_UNIX_HDR)</if>
</set>
<set var="ADVANCED_GTK_SRC" hints="files">
$(ADVANCED_GTK_PLATFORM_SRC)
src/gtk/taskbar.cpp
src/gtk/eggtrayicon.c
src/gtk/hildon/notifmsg.cpp
</set>
<set var="ADVANCED_GTK_HDR" hints="files">
$(ADVANCED_GTK_PLATFORM_HDR)
wx/gtk/hildon/notifmsg.h
wx/gtk/taskbar.h
</set>
@@ -3849,7 +3863,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC) $(ADVANCED_MOTIF_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_SRC)</if>
@@ -3862,7 +3876,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='OSX_IPHONE'">$(ADVANCED_OSX_IPHONE_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR) $(ADVANCED_MOTIF_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(ADVANCED_UNIX_HDR) $(ADVANCED_GTK1_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>

33759
configure vendored

File diff suppressed because it is too large Load Diff