GTK1 mods

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-01-23 12:01:10 +00:00
parent 5004c3adef
commit 601f1cfb1a

View File

@@ -2884,8 +2884,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="OPENGL_SRC" hints="files">
<if cond="TOOLKIT=='MAC'">src/mac/carbon/glcanvas.cpp</if>
<if cond="TOOLKIT=='COCOA'">src/cocoa/glcanvas.mm</if>
<if cond="TOOLKIT=='GTK'">src/gtk/glcanvas.cpp</if>
<if cond="TOOLKIT=='GTK1'">src/gtk1/glcanvas.cpp</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">src/gtk/glcanvas.cpp</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">src/gtk1/glcanvas.cpp</if>
<if cond="TOOLKIT=='MSW'">src/msw/glcanvas.cpp</if>
<if cond="TOOLKIT=='WINCE'">src/msw/glcanvas.cpp</if>
<if cond="TOOLKIT=='MOTIF'">src/x11/glcanvas.cpp</if>
@@ -2896,8 +2896,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="OPENGL_HDR" hints="files">
<if cond="TOOLKIT=='MAC'">wx/mac/carbon/glcanvas.h</if>
<if cond="TOOLKIT=='COCOA'">wx/cocoa/glcanvas.h</if>
<if cond="TOOLKIT=='GTK'">wx/gtk/glcanvas.h</if>
<if cond="TOOLKIT=='GTK1'">wx/gtk1/glcanvas.h</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">wx/gtk/glcanvas.h</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">wx/gtk1/glcanvas.h</if>
<if cond="TOOLKIT=='MSW'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='WINCE'">wx/msw/glcanvas.h</if>
<if cond="TOOLKIT=='MOTIF'">wx/x11/glcanvas.h</if>
@@ -2949,7 +2949,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='GTK1'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_SRC)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
@@ -2986,7 +2985,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MAC'">$(BASE_MACOSX_WXMAC_HDR)</if>
<if cond="TOOLKIT=='COCOA'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='GTK1'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='X11'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
<!-- FIXME: TOOLKIT!='MAC' is what we really want -->
@@ -3036,8 +3034,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<!-- GUI sources: -->
<set var="LOWLEVEL_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK1'">$(GTK1_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_SRC) $(MSW_DESKTOP_LOWLEVEL_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_SRC)</if>
@@ -3048,8 +3046,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MGL'">$(MGL_LOWLEVEL_SRC)</if>
</set>
<set var="LOWLEVEL_HDR" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK1'">$(GTK1_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_LOWLEVEL_HDR) $(MSW_DESKTOP_LOWLEVEL_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_LOWLEVEL_HDR)</if>
@@ -3061,8 +3059,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set>
<set var="GUI_SRC" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='GTK1'">$(GTK1_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_SRC)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_SRC) $(MSW_DESKTOP_SRC)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_SRC) $(WINCE_SRC)</if>
@@ -3071,8 +3069,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='PM'">$(OS2_SRC)</if>
</set>
<set var="GUI_HDR" hints="files">
<if cond="TOOLKIT=='GTK'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='GTK1'">$(GTK1_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(GTK_HDR)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION==''">$(GTK1_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MOTIF_HDR)</if>
<if cond="TOOLKIT=='MSW'">$(MSW_HDR) $(MSW_DESKTOP_HDR)</if>
<if cond="TOOLKIT=='WINCE'">$(MSW_HDR) $(WINCE_HDR)</if>
@@ -3097,8 +3095,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='MAC'">$(ADVANCED_MAC_SRC)</if>
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK1'">$(ADVANCED_UNIX_SRC) $(ADVANCED_GTK1_SRC)</if>
<if cond="TOOLKIT=='GTK' and TOOLKIT_VERSION=='2'">$(ADVANCED_UNIX_SRC) $(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>
</set>
@@ -3109,7 +3107,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='COCOA'">$(ADVANCED_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK1'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='X11'">$(ADVANCED_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(ADVANCED_OS2_HDR)</if>
</set>
@@ -3141,7 +3138,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_SRC)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK_SRC)</if>
<if cond="TOOLKIT=='GTK1'">$(MEDIA_UNIX_SRC) $(MEDIA_GTK1_SRC)</if>
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_SRC)</if>
<if cond="TOOLKIT=='PM'">$(MEDIA_OS2_SRC)</if>
</set>
@@ -3152,7 +3148,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<if cond="TOOLKIT=='COCOA'">$(MEDIA_COCOA_HDR)</if>
<if cond="TOOLKIT=='MOTIF'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='GTK1'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='X11'">$(MEDIA_UNIX_HDR)</if>
<if cond="TOOLKIT=='PM'">$(MEDIA_OS2_HDR)</if>
</set>