Compare commits

...

247 Commits

Author SHA1 Message Date
Bryan Petty
5001178f31 This commit was manufactured by cvs2svn to create tag
'wxPy_b4_virtualization_fix'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_b4_virtualization_fix@37361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 20:43:56 +00:00
Robin Dunn
c3f93e04f5 ShrinkMode --> FitToCurrentPage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 20:43:56 +00:00
Michael Wetherell
3e63c3158d Compile fix for --enable-stl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 18:12:16 +00:00
Michael Wetherell
9e39d88994 Remove richedit sample from configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 18:01:48 +00:00
Julian Smart
8ef51d6704 Attempt at using inkedit control for wxTextCtrl, when PC is tablet enabled. Currently
doesn't behave properly but is a first step.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 17:56:44 +00:00
Julian Smart
da817fa6eb Changed function to SetFitToCurrentPage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 17:51:11 +00:00
Julian Smart
ddec9f1eeb Added wxSYS_TABLET_PRESENT to check for tablet capability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 17:42:15 +00:00
Julian Smart
9393136df5 Take into account Info.plist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 17:37:56 +00:00
Julian Smart
8cd96c6b44 m_border and accessors not used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 17:37:26 +00:00
Stefan Csomor
e7ead9d700 guard against early redraws
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 16:58:19 +00:00
David Surovell
63c6e6c806 added protection against non-file drop targets receiving files (and subsequently crashing)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 16:24:26 +00:00
Jamie Gadd
26c2a266cd Add check for wxGLCanvas to wxCheckWindowWndProc. Fixes bug #1425106.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 13:44:06 +00:00
David Surovell
93a2619d10 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 05:08:13 +00:00
Kevin Hock
52437a76c3 CheckValidator should not return false if no variable is associated for data storage, data storage is optional [ fixes bug 1414892, closes patch 1415315 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 04:24:40 +00:00
Kevin Ollivier
471e64d61e wx-config now provides all the needed flags, so lflags just adds duplicates.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-06 03:03:24 +00:00
Vadim Zeitlin
259858fc6a now we don't only show label mnemonics but they also work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 23:50:13 +00:00
Vadim Zeitlin
12848fda6f no changes; just some (very) minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 23:39:37 +00:00
Vadim Zeitlin
3fe5be6e01 use XmNrecomputeSize instead of manually resizing the label (and unmanaging/managing it in process resulting in flicker) (patch 1420899)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 23:20:26 +00:00
Vadim Zeitlin
2ce89389bf use GTKRemoveMnemonics instead of wxStripMenuCodes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 23:02:47 +00:00
Vadim Zeitlin
ee6dd41a50 removed GTKConvertMnemonics() which is not used in GTK1 (which doesn't support mnemonics)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 22:58:41 +00:00
Vadim Zeitlin
d44a933726 honour the mnemonics; don't use gtk_label_set_markup() for foreground colour as this doesn't seem to be necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 22:41:39 +00:00
Robin Dunn
1dabdced0e For consistency with the docs and with wxMSW the keycode for
Ctrl-letter EVT_CHAR events should be in the range 1-26.  Also, make
the m_uniChar value match the keycode for KEY_UP/DOWN events for
letters.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 22:10:13 +00:00
Robin Dunn
22b549f247 BeginDrawing/EndDrawing are deprecated, and never really did anything
to begin with.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 22:01:48 +00:00
Robin Dunn
1d9bb35f77 AddSubPage --> InsertSubPage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 22:01:12 +00:00
David Surovell
68204d23c2 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 22:00:44 +00:00
Włodzimierz Skiba
63ae3663c5 Missing break after error in daily build.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:58:21 +00:00
David Surovell
3660902c0d moved ctor implementation into dot-cpp file; reformatted
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:53:57 +00:00
David Surovell
71786e29fa added ctor implementation from header + initialzation; more reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:52:30 +00:00
Julian Smart
c1bf3a3e90 Removed richedit from index file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:45:23 +00:00
Julian Smart
fe59c7de50 Removed obsolete files from richedit sample directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:43:53 +00:00
Julian Smart
99120938f4 Removed textedit sample from distribution script
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:41:22 +00:00
Julian Smart
2a15e880bd Removed textedit from top-level sample makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:40:48 +00:00
Mart Raudsepp
1fb1f1d833 Remove remark on wxTLW::Maximize that it only works on Windows. It works on wxGTK too, and I see implementation for
Mac aswell.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 20:39:15 +00:00
Vadim Zeitlin
aae7e12e1d set USE_QA to 1 for VC builds only by default (real fix for bug 1419152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 16:09:54 +00:00
Roger Gammans
1d7bc9130c fix for [1357272] . Replace the fake year with unique tokens to prevent
substring matches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 14:10:51 +00:00
Roger Gammans
42b62acfc2 Add flags to test dates struct which allow us to skip ecpected failures.
Use new flags feature to allow us to test format dates outside the two digit
 year parse range.
 Add dates to test for sf.net bug #1357272 and a couple of related issues.
  (eg,6Feb{1856,1857,1937}) .


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37323 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 14:05:39 +00:00
Roger Gammans
f30057dfbf Fix for compiler error with gcc 3.3.5 and cppunit 1.10.0 and
Improve readablity of test.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37322 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 14:01:37 +00:00
Vadim Zeitlin
b7c542d5c6 renamed AddSubPage() with pos parameter to InsertSubPage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37321 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 13:00:43 +00:00
Jamie Gadd
7ad4d6914d Put previous change under correct heading
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 12:47:38 +00:00
Jamie Gadd
9fb2139d11 Mention wxDC::{Begin,End}Drawing deprecation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 12:41:21 +00:00
Vadim Zeitlin
1ac453272c set USE_QA to 1 for consistency with the IDE builds (closes 1419152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37318 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 12:39:19 +00:00
Vadim Zeitlin
9d5371c60b renamed AddSubPage() with pos parameter to InsertSubPage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 12:27:20 +00:00
Jamie Gadd
68df211fae Deprecate wxDC::{Begin,End}Drawing()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 11:59:59 +00:00
David Surovell
6037dd262f correct include file conditionalization, take 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 09:14:02 +00:00
David Surovell
b46dde2772 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 07:27:48 +00:00
David Surovell
61fa2e39da cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 07:15:26 +00:00
Mart Raudsepp
8e729eb44b GTK2: Revert one set_resizable back to set_policy for now, as we need allow_shring to be TRUE right now, due to doing
bad things(tm) to the size requests of child widgets inside the toplevel.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-05 00:23:32 +00:00
Stefan Csomor
ea9e382e48 using common info.plist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 19:53:04 +00:00
Stefan Csomor
4d524cdd0e common Info.plist for XCode projects
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 19:44:14 +00:00
David Surovell
28bfd0a1d2 added appropriate WX_PRECOMP bracket for new include statement
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 18:49:39 +00:00
Stefan Csomor
a4e3cdf025 support for default location added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 16:23:46 +00:00
Stefan Csomor
e3aeade0d6 linking commands on the individual window level, otherwise built-in handlers override our own (eg Paste is handled internally in a textcontrol without going through our own, resulting in changing 'read-only' unicode textcontrol)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 15:38:01 +00:00
Stefan Csomor
35d9ac0686 deactivate read-only implementation for unicodetextcontrol because it cannot be selected otherwise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 15:35:06 +00:00
Mart Raudsepp
1d13cff399 I'm no fan of that focus ring being drawn inside the wxMiniFrame close button after a click (and release not on the
button), making the button look weird. So... don't focus on click.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 13:06:06 +00:00
Mart Raudsepp
07d04e37fd Optimize (for size) the cross_xpm used for the X button in wxMiniFrame. We use only 2 colors, so don't declare 16 of
them. Also swap the characters used to make the X visible in source code.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 12:39:23 +00:00
Mart Raudsepp
9adb906369 GTK2: gtk_widget_set_uposition -> gtk_window_move for wxMiniFrame. No, I don't like emulated window moves, so I can't
use my wm to move this minifram, but alas for now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 12:31:10 +00:00
Mart Raudsepp
cd6645a2c4 GTK2: gtk_widget_set_uposition -> gtk_window_move for wxPopupWindow - migration appears to work fine for it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37301 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 12:15:31 +00:00
David Surovell
c2794afdbb added missing include; minor reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37300 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 04:58:30 +00:00
Mart Raudsepp
0857d1d659 GTK2: Add a GTK_WIDGET_DRAWABLE check to the gtk_widget_draw replacement to make it call identical worker functions
as before, and not spew warnings


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 02:10:53 +00:00
Mart Raudsepp
f91f71e384 GTK2: gtk_widget_{push,pop}_visual don't do anything in GTK2, other than break compilation with
GTK_DISABLE_DEPRECATED


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 01:49:25 +00:00
Mart Raudsepp
18e989043b gtk_signal_connect -> g_signal_connect in unix/mediactrl.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 01:47:01 +00:00
Mart Raudsepp
6f85e71200 GTK2: gtk_entry_* -> gtk_editable_* where necessary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 00:50:47 +00:00
Mart Raudsepp
78e017d8f3 GTK2: gtk_radio_button_group -> _set_group; A missed gtk_label_set to set_text. Add a FIXME note for wxStaticText
probably not honoring SetBackgroundColour


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-04 00:09:16 +00:00
Mart Raudsepp
2e14a11616 GTK2: gtk_container_children -> gtk_container_get_children
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:39:48 +00:00
Mart Raudsepp
8394218c13 GTK2: gtk_check_menu_item_set_state -> _set_active; gtk_label_{parse_uline,set_text} and co ->
gtk_label_set_text_with_mnenomics


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:38:01 +00:00
Mart Raudsepp
38f1df7c9c GTK2: gtk_notebook_set_page -> gtk_notebook_set_current_page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:26:21 +00:00
Mart Raudsepp
1856b88fc3 GTK2: gtk_progress_bar_update -> gtk_progress_bar_set_fraction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:22:40 +00:00
Mart Raudsepp
34c1f23146 GTK2: gtk_widget_draw -> gtk_widget_queue_draw + gdk_window_process_updates. Do we really want to force an immediate
redraw here?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:14:34 +00:00
Mart Raudsepp
1ab9e06d6a GTK: gtk_menu_{insert,append} -> gtk_menu_shell_{insert,append}
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:07:20 +00:00
Robin Dunn
c0ab3f7fbb Allow Save Settings to save even when AutoSave is turned off
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:07:15 +00:00
Robin Dunn
a16c6fdcbd Don't assume that msw.remap was 1, instead change it back to what it
really was before.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 23:05:15 +00:00
Mart Raudsepp
a7c12d28e6 GTK2: gtk_label_set -> gtk_label_set_text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 22:58:26 +00:00
Mart Raudsepp
e343da37ac GTK2: gtk_toggle_button_set_state -> gtk_toggle_button_set_active
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 22:53:37 +00:00
Mart Raudsepp
92ed8becfc GTK2: gtk_timeout_add -> g_timeout_add; gtk_timeout_remove -> g_source_remove.
Fix gtk_frame_urgency_timer_callback return type (gint -> gboolean).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 22:22:27 +00:00
Mart Raudsepp
43a52404ac GTK2: gtk_window_set_policy -> gtk_window_set_resizable. Slight change for resizable toplevel behaviour -
allow_shrink is now always FALSE - it being TRUE is told to be 99% of the times a bad idea, too. I think we aren't
the 1% case here


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 22:08:01 +00:00
Mart Raudsepp
67b73b9aab GTK2: gtk_draw_* -> gtk_paint_*
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 21:57:03 +00:00
Mart Raudsepp
370dc79c5a GTK2: gtk_widget_set_usize -> gtk_widget_set_size_request
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 21:51:21 +00:00
Mart Raudsepp
5d038ec59c GTK2: gtk_idle_add_priority -> g_idle_add_full; gtk_idle_remove -> g_source_remove
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 21:44:31 +00:00
Mart Raudsepp
761a108c3b wxGTK2 compiles fine with {G,PANGO}_DISABLE_DEPRECATED. Define them to catch deprecated function usage for older
glib/pango versions and/or other systems. Is there a better place for this than defs.h?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 21:27:04 +00:00
David Surovell
162d3be3ca minor reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 21:15:25 +00:00
Mart Raudsepp
158949492d g_main_set_poll_func(x) -> g_main_context_set_poll_func(NULL, x). Former deprecated since glib-2.2. Latter available
since at least glib-2.0


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 20:57:00 +00:00
Mart Raudsepp
afa7bd1eef Remove obsolete GTK1 compatibility macros. Patch #1413458 - Paul Cornett
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 20:38:55 +00:00
Mattia Barbon
1794103bab DeleteFunction argument should be non-const since it
is deleted inside the function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37272 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 18:26:55 +00:00
Julian Smart
f219764488 Fix for WinCE - no delayed sizing for now
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 16:30:14 +00:00
Julian Smart
7e02be855d Applied patch from Neil Robinson to allow manipulation of unattached menubars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 16:29:05 +00:00
Robin Dunn
ab552aa4d7 Better cleanup of circular references.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-03 06:51:34 +00:00
Robin Dunn
84d08d87eb Fix for bug #1422217. Menu items with the checked bitmap set need to
be owner drawn.  This also fixes submenu items that have a bitmap.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 20:59:24 +00:00
Julian Smart
8e1b6d43a7 Fix nonsensical checked menu item label and behaviour
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 18:19:04 +00:00
David Surovell
fd0fca1a25 add missing wxHTML sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 17:00:33 +00:00
Julian Smart
f9ed2d1680 Scroll text into view when typing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 13:05:30 +00:00
Robin Dunn
454a21e9cd use UNICODE=1 by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37261 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 02:20:02 +00:00
Robin Dunn
1efe352383 use UNICODE=1 by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 02:02:27 +00:00
Robin Dunn
7e08d4efc7 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 02:02:04 +00:00
Robin Dunn
9037d43c67 Mention the SWIG_VERSION change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 01:48:40 +00:00
Robin Dunn
e79c4165b4 minor layout tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-02 01:47:16 +00:00
Robin Dunn
6aabc8da32 Added wxPython wrappers for the new wx.Treebook and wx.Toolbook
classes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-01 23:46:43 +00:00
Robin Dunn
917cd965fa Set the toolbar orientation based on the wxBK_ alignment style flag
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-01 23:45:14 +00:00
Włodzimierz Skiba
b2383543b6 eVC3 build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-01 15:23:19 +00:00
Włodzimierz Skiba
63a3cd7a8c wxOS2 warning fixes after daily build log.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-01 13:52:08 +00:00
Roman Rolinsky
3f31297359 updated from CVS
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-02-01 10:25:54 +00:00
Włodzimierz Skiba
96dcd41a12 [ 1420190 ] Enable backspace key on smartphone
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 21:37:32 +00:00
Włodzimierz Skiba
6fc07dd8c0 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 21:29:13 +00:00
Włodzimierz Skiba
2b9238077a Build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 21:27:40 +00:00
Robin Dunn
9ce001802c Delay part of the setup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 17:48:19 +00:00
Julian Smart
556bf2c368 Mac doesn't like getting an icon if it's a bitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 16:22:54 +00:00
Julian Smart
bd1a4a99fc wxControl::SetLabel no longer strips out codes so do it here
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 16:01:19 +00:00
Julian Smart
4c410aa14e Added missing include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 15:37:19 +00:00
Julian Smart
59fbed90b9 Added wxUSE_TOOLBOOK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37235 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 15:12:00 +00:00
Julian Smart
5ec3bc4302 Regenerated configure for wxToolbook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 14:37:49 +00:00
Julian Smart
cc8bc5aa9c Added SetSheetStyle to property sheet dialog to allow specification
of alternative book styles and shrink-to-fit mode
Updated dialogs sample with example of toolbook-style property sheet dialog


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 13:54:17 +00:00
Julian Smart
93bfe54527 Introduced the ability to size a book control based on the currently selected page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 13:51:33 +00:00
Julian Smart
7567821087 Put MFC sample at end of list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 09:29:24 +00:00
Julian Smart
77fa9e4447 Added toolbook.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 09:28:51 +00:00
Robin Dunn
e062c6a4d0 Another patch from Tim Kosse for using images on more than one column
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 02:37:23 +00:00
Robin Dunn
e731cb64e6 Putting the SetBestFittingSize() call at the end of wxToolBar::Realize
seems to cause more problems than it fixes, and in fact I can't seem
to duplicate the problems that it had before any longer, so let's
remove it.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 01:55:59 +00:00
Włodzimierz Skiba
588be5ae1c Last parameter of GetVolumeInformation() is not pointer.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-31 00:54:26 +00:00
Julian Smart
84dc821c24 Reverting patch 1325857
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 20:04:58 +00:00
Włodzimierz Skiba
03a37db96a Tree != List
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 16:46:55 +00:00
Robin Dunn
34d6780ea2 This is a TOOLBOOK, not a LISTBOOK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 16:38:19 +00:00
Julian Smart
f4edf1386a Added wxUSE_TOOLBOOK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 16:26:30 +00:00
Julian Smart
fd0d619f5d Entry for wxToolbook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 16:00:22 +00:00
Julian Smart
d709457c8d Adapted notebook sample to demonstrate wxToolbook
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 15:40:32 +00:00
Julian Smart
7dcea26b0b Updates for wxToolbook class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 15:38:51 +00:00
Julian Smart
3c55b3652b Added wxToolbook class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 15:35:04 +00:00
Julian Smart
233387bdcb Separated out book control sizing code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 15:19:48 +00:00
Jouk Jansen
e16c4fe100 Committing in .
Updated OpenVMS compile support

 Modified Files:
 	wxWidgets/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-30 12:32:08 +00:00
David Surovell
2458faeb60 wxPython tab cleaning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 17:35:47 +00:00
Robert Roebling
6e5551ad85 Fix rawbitmap sample to clear bitmap first.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 15:44:21 +00:00
David Surovell
9d7d3b1f9f remove extraneous whitespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 08:49:53 +00:00
Robin Dunn
bf56f4ece0 Ensure the window is still valid before adjusting the scrollbars
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 02:36:29 +00:00
Robin Dunn
59c24dcbf6 Minor demo tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 02:34:44 +00:00
Robin Dunn
1ea8df6e6b Changes needed to be able to build with SWIG 1.3.24, 1.3.27 as well as
the upcoming 1.3.28, using #if statements on SWIG_VERSION.

Adjustments to ownership of SWIG objects, add some destructors and
explicitly disown non-window objects when their ownership is
transfered to a C++ object.

Since all window objects are owned by their parent, or by themselves,
always set their thisown attribute to False.

Explicitly set thisown to False after any Destroy() methods are
called, so SWIG doesn't try to destroy them again.

Etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37205 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 02:33:00 +00:00
Robin Dunn
dd400cf46d Ouput a SWIG_VERSION #define to the wrapper file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37204 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 02:14:44 +00:00
Robin Dunn
214c4fbea5 Changes needed to be able to build with SWIG 1.3.24, 1.3.27 as well as
the upcoming 1.3.28, using #if statements on SWIG_VERSION.

Adjustments to ownership of SWIG objects, add some destructors and
explicitly disown non-window objects when their ownership is
transfered to a C++ object.

Since all window objects are owned by their parent, or by themselves,
always set their thisown attribute to False.

Explicitly set thisown to False after any Destroy() methods are
called, so SWIG doesn't try to destroy them again.

Etc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 02:09:45 +00:00
Robin Dunn
9a3fba2459 no longer need to lowercase the input ourselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 01:36:59 +00:00
Robin Dunn
b6222be998 Use reference types on SetDimension so the proper typemaps are used.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-29 01:35:14 +00:00
David Surovell
09e28f7f8d minor changes as per RN comments - add some comments and reorder a switch stmt.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 18:25:40 +00:00
David Surovell
13a1e96f92 improved LaunchDefaultBrowser on FreeBSD systems by using the BROWSER env var when no HTML file MIME mapping is found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 18:06:09 +00:00
Stefan Neis
c52e0d0e51 Do test for get{host,serv}byname_r in C++ mode, so non visible declarations
cannot break compilation of gsocket.cpp.
Replaced AC_LANG_SAVE/RESTORE by AC_LANG_PUSH/POP for consistency.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 13:52:17 +00:00
Stefan Csomor
e8027adbb6 converting menu ids and safeguarding against missing menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 12:28:56 +00:00
Julian Smart
c137ddc91f Further attempts at WinCE media control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 10:56:27 +00:00
Stefan Csomor
d086c633ad attempt to fix endian problems when doing cross-compiles for universal binaries from a ppc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 06:59:20 +00:00
Kevin Ollivier
e61e59643e Adding Reswig and Universal binary options to both build_packages.sh and the wxPythonOSX/build script.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 02:11:22 +00:00
Vadim Zeitlin
3110909fec SetSelection() must update m_selectionOld, otherwise it doesn't correspond to the real selection any more and selection change events are sent twice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-28 00:43:23 +00:00
Julian Smart
be96ed8c5d Further steps towards media control support in WinCE (Ryan Norton)
- not yet working


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 23:32:12 +00:00
Julian Smart
ca1514b304 Small typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 23:30:50 +00:00
Vadim Zeitlin
b9bae707bb don't eat all events if m_maxLength is 0: this means no limit according to the docs and both wxMSW and wxGTK behave like this
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 23:05:23 +00:00
Kevin Ollivier
2ca2357ded Since Universal binaries compile the same file twice for different architectures, we need to allow WORDS_BIGENDIAN to be re-defined.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 22:54:41 +00:00
Vadim Zeitlin
f20e3df6d3 fixed MIPSpro version in the comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 22:50:16 +00:00
Michael Wetherell
5a0a8487c4 Link oleacc.lib conditionally since VC++ 5 w/o PSDK doesn't have it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 22:07:12 +00:00
Włodzimierz Skiba
a33e2266dc Fix fro conflict between defs.h and glib headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 17:32:03 +00:00
Stefan Csomor
aa44b55d4f removing unnecessary code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 17:05:23 +00:00
Stefan Csomor
04bf2fb515 adapting keycode field usage for EVT_CHAR in unicode to MSW variant (full unicode char)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 17:04:15 +00:00
Włodzimierz Skiba
799181197d Fix fro conflict between defs.h and glib headers.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 15:43:16 +00:00
Stefan Csomor
8071012d63 app.h must be included for the non RAEL implementation, as universal binaries command line builds don't support precomps yet ...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37177 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 09:50:40 +00:00
Kevin Hock
204b046ea0 Fix InterruptWait on wxBase; use polling on wxBase (wxStopWatch is unavailable) and also correctly restore timeout to original value after _Wait [ Slightly modified patch 1410868 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 00:50:11 +00:00
Kevin Hock
2decc3bd99 Fixed wxSocketBase::InterruptWait on wxBase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 00:49:12 +00:00
Vadim Zeitlin
3f8e6923b0 tentative compilation fix for MIPSpro 7.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-27 00:23:48 +00:00
Kevin Ollivier
7afc46abae Fixes for wxMac Universal binary support. With these changes, I now get a working Universal build simply by passing --enable-universal_build to configure.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37172 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 23:54:31 +00:00
Julian Smart
33a8a62852 Fixed duplicate guard
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37171 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 22:35:13 +00:00
Włodzimierz Skiba
4835f3be09 More headers for wxBase/MSW needed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 21:08:11 +00:00
Włodzimierz Skiba
0ba6a83624 Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 19:53:08 +00:00
Włodzimierz Skiba
23ff76d5ad Blind fixes for warnings in wxTinderbox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 19:35:32 +00:00
Włodzimierz Skiba
78f9336500 Blind fixes for warnings in wxTinderbox.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 19:22:56 +00:00
Włodzimierz Skiba
b20edf8b33 Better #include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 19:06:06 +00:00
Włodzimierz Skiba
95d00805e0 #include moved to module.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 18:59:49 +00:00
Włodzimierz Skiba
b73e73f912 Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 17:20:50 +00:00
Włodzimierz Skiba
8498a2858b Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 17:00:19 +00:00
Włodzimierz Skiba
521bf4ff3e Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 16:50:23 +00:00
Stefan Csomor
665b537f51 implementing pure carbon event behaviour, getting rid of doubly executed events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 16:41:53 +00:00
Włodzimierz Skiba
f03e8f9b16 Filename correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 16:03:33 +00:00
Włodzimierz Skiba
9b5f189564 Include order is wxprec.h=>defs.h=>platform.h=>setup.h so remove explicit setup.h inclusion not touched by chckconf.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 16:02:02 +00:00
Włodzimierz Skiba
b7ba00e77a wxBusyInfo interface moved to generic to make space for possible native implementations. wxInfoFrame moved from header to module.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 15:40:46 +00:00
Włodzimierz Skiba
1e25a373d0 Improved preprocessor guards for numeric dialogs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 15:33:27 +00:00
Włodzimierz Skiba
b21164a542 Typo fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 15:31:07 +00:00
Włodzimierz Skiba
11f104e5c1 Warning fixes after recent commits.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 15:29:58 +00:00
Julian Smart
163570537b Suppress VC++ 2005 deprecation warnings (for now)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 13:15:47 +00:00
Robert Roebling
065fa73213 GTK2 RGBA has 32 bits.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 12:28:19 +00:00
Robert Roebling
a1cd956478 wxImage::Copy() forgot the alpha channel.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 12:07:10 +00:00
Robin Dunn
22b9d4ac49 show unicode/ansi mode on startup too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 00:33:39 +00:00
Robin Dunn
e280c9ca95 Add supoprt for wxListCtrl::OnGetItemColumnImage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-26 00:31:31 +00:00
David Surovell
08a175cec7 fixed compilation failure introduced in prior commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 23:48:09 +00:00
Jamie Gadd
dc497201eb Calculate correct client size for windows that are using deferred sizing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 23:40:20 +00:00
Robin Dunn
208458a7f5 Patch from Tim Kosse to add supoprt for wxListCtrl::OnGetItemColumnImage
which enables images to be specified for columns other than zero in
virtual list controls.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 23:29:02 +00:00
Jamie Gadd
0a6f92b85c Clarify wxMessageBox usage. Fixes bug #1414535.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 23:26:27 +00:00
David Surovell
a7d5151df0 cleanup - more reformatting; fixed bug introduced in prior commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 23:07:33 +00:00
David Surovell
6591df24b6 cleanup - more reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 20:57:54 +00:00
Robin Dunn
f36b056bd0 Removed wxLogNull's used to supress errors coming from
wxCheckWindowWndProc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 20:28:12 +00:00
Robin Dunn
f57f984cc0 Switched wxCheckWindowWndProc to always use the window class name for
comparisons.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 20:26:59 +00:00
David Surovell
b1ec2381a2 cleanup - major reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 20:07:58 +00:00
Julian Smart
e995b63c01 Don't require drag and drop
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 18:15:48 +00:00
Julian Smart
a45d2855c6 WinCE fixes (in case a WinCE-friendly backend gets written one day)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 18:15:24 +00:00
Julian Smart
94113cc555 Move some OLE utilities to oleutils.cpp and simplified date conversion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 18:14:37 +00:00
Julian Smart
a5fc9a1ca0 WinCE fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 18:14:08 +00:00
Julian Smart
a5fa20cbd7 Updated change log
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 18:12:14 +00:00
Stefan Neis
f0b805fab6 Fixed "typo".
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 17:58:50 +00:00
Stefan Neis
17f66434a4 Cleaned attempts at fixing NetBSD compilation commited in previous version.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 14:31:03 +00:00
Stefan Neis
def7c04a01 Yet another try to fix NetBSD's problem with getservbyname_r.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 14:29:09 +00:00
Julian Smart
32df13a52a First stab at adding --enable-universal_binary
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 14:04:54 +00:00
Włodzimierz Skiba
0e2a14e5e3 Fixes for building wxOS2 shared with OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 13:59:55 +00:00
Stefan Csomor
980ee83f63 key/char event changes for inline editing (japanese/hiragana etc)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 13:11:21 +00:00
Stefan Csomor
f139ea01b8 key/char event changes for inline editing (japanese/hirgana etc)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 12:55:33 +00:00
Stefan Csomor
835a347314 adapting comment to new implementation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 12:52:18 +00:00
Julian Smart
c3e5d4e246 Added wxHtmlHelp change log
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 11:09:45 +00:00
Michael Wetherell
e45689df6c Fixes for the GTK1 split
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-25 00:18:12 +00:00
David Surovell
277ea1b490 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 22:59:49 +00:00
Vadim Zeitlin
7d9d249be4 fixed WX_DEFINE_SORTED_ARRAY_INT example
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 22:15:58 +00:00
Włodzimierz Skiba
7ee1ea9d99 Static build for wxMGL/DOS and little readme.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 20:23:16 +00:00
Włodzimierz Skiba
40b13bcf24 msw/private.h needs msw/mslu.h in wxBase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 19:40:59 +00:00
Stefan Csomor
392e179f4f mask fixes for non-core graphics case (this build uses CopyDeepMask for painting, which apparently doesn't like 24RGB)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 12:58:32 +00:00
Robin Dunn
7bdb1bc42b fix for broken files that were recently checked in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 02:32:18 +00:00
Robin Dunn
9c605285c8 move the nodefault option into _defs.i too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 02:24:25 +00:00
Vadim Zeitlin
c72b1ad70a no changes but more comments in DoSetClientSize() (explains the change of rev 1.624 and also why we can't use AdjustWindowRect here)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-24 02:04:53 +00:00
Robin Dunn
7449af7300 reSWIGged with the new SWIG runtime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 23:04:44 +00:00
Robin Dunn
9269629e9e more about the downloadable swig
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 23:03:22 +00:00
Robin Dunn
32fe513144 reSWIGged with new SWIG runtime
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 23:01:54 +00:00
Michael Wetherell
e1dfb8942c Remove old Makefile.ins
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37102 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 22:55:59 +00:00
Stefan Neis
385ebb5d81 Yet another attempt at making the getservbyname_r prototype visible.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 22:54:56 +00:00
Robin Dunn
1069efb91a comment fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 22:48:14 +00:00
Michael Wetherell
525ce60acf lndir no longer needed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 22:44:54 +00:00
Michael Wetherell
53375f8e5a Back to copying for make dist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 22:41:47 +00:00
Stefan Neis
728258f45f Testing if using -D_REENTRANT helps compiling socket code on NetBSD.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 20:47:58 +00:00
Robin Dunn
1a14abf991 Clear possible exception from failed wxPyConvertSwigPtr
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 20:06:39 +00:00
Michael Wetherell
d74c6a9599 Fix for gtk1 separation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 19:52:12 +00:00
Michael Wetherell
25a0a8f41e Add gtk1 files to make dist
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 19:31:48 +00:00
Michael Wetherell
154a91dc33 Fixes for gtk1 separation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 18:50:34 +00:00
Julian Smart
b598ec915c Only do sanity check if the stream is seekable, otherwise it'll always fail
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 18:12:47 +00:00
Vadim Zeitlin
1ac7660914 extracted wxFrame::MSWTranslateMessage() implementation into new MSWDoTranslateMessage so that it can be reused by wxMDIChildFrame; this allows to pass the correct window to ::TranslateAccelerator() and fix UI updating of the MDI child menu items (bug 1214439)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 16:38:07 +00:00
Vadim Zeitlin
a1a1ca8998 no real changes; just a very minor cleanup in wxFrame::MSWTranslateMessage()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 15:43:26 +00:00
Vadim Zeitlin
5b07594ad3 added tests of update UI handlers for clipboard menu items; minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 15:40:03 +00:00
Michael Wetherell
7e52dfd26d gtk1 fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 14:29:29 +00:00
Michael Wetherell
d044deea91 Regenerate with gtk1 changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 12:11:50 +00:00
Michael Wetherell
601f1cfb1a GTK1 mods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 12:01:10 +00:00
Jamie Gadd
5004c3adef Improve extended key handling code readability.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 10:01:46 +00:00
Chris Elliott
71521e3757 fix Borland part of bug 1158383
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 09:40:05 +00:00
David Surovell
7c2e5dec5a cleanup - more reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 04:11:46 +00:00
Mart Raudsepp
8ff12d3d92 Add wxGTK1 port to bakefiles files.bkl. Please review this commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 03:58:00 +00:00
Mart Raudsepp
1be7a35c5e Include gtk1 headers for non-gtk2. I don't really like this CPP logic, or more exactly __WXGTK__ without __WXGTK20__
being GTK1, oh well.
Might have missed some.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 03:27:34 +00:00
Mart Raudsepp
8ef94bfc25 Remove GTK2 specific prototypes from wx/include/gtk1. wx/gtk1/hdr into the header comments instead of wx/gtk/hdr or
hdr


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 02:28:01 +00:00
Mart Raudsepp
3ffa7babb9 wx/gtk1/taskbarpriv.h and gnome/gprint.h not necessary for gtk1. Deleting.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37064 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 02:10:26 +00:00
Mart Raudsepp
3cbab64109 Remove GTK2 stuff from src/gtk1. Rename wx/gtk includes to wx/gtk1.
57 files changed, 394 insertions(+), 6767 deletions(-)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-23 01:14:32 +00:00
Mart Raudsepp
9fa72bd2a6 Use g_signal* instead of deprecated gtk_signal*. Use proper casts for the arguments.
Worth norting from the GTK+ docs: "For future usage, direct use of the GSignal API is recommended, this avoids
significant performance hits where GtkArg structures have to be converted into GValues."


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 23:28:58 +00:00
David Surovell
ce61519034 applied patch 1411688
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 21:59:00 +00:00
David Surovell
dfea7acc19 cleanup - heavy reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 21:26:28 +00:00
Mart Raudsepp
bdbd4e9612 Nuke GTK1 from include/gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 21:00:19 +00:00
Michael Wetherell
6330f4bb19 Update instructions to match mgl 6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 20:37:38 +00:00
Mart Raudsepp
68567a967b Nuke GTK1 from src/gtk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 20:29:17 +00:00
8526 changed files with 130939 additions and 3004073 deletions

View File

@@ -1,12 +0,0 @@
.gdb_history
config.cache
configarg.cache
config.status
wx-config
config.log
stamp-h.in
Makefile
setup.h
*tags
.DS_Store
autom4te.cache

View File

@@ -1,262 +0,0 @@
------------------------------------------------------------------------
How to build the sources from CVS
------------------------------------------------------------------------
Please use the install.txt files in docs/gtk, docs/msw, docs/motif, docs/mac
etc. alongside these instructions.
I) Windows using plain makefiles
----------------------------------------
a) If using Microsoft Visual C++ 5.0 or 6.0
Ensure that the command-line compiler and tools (including
nmake) are installed and ready to run. Depending on your
installation there may be a batch file (commonly named VCVARS32.BAT)
that needs to be run to set correct environment variables and PATH entries.
Continue with item c) below.
b) If using the MinGW or Cygwin compilers
You can get MinGW from http://www.mingw.org/
Cygwin is available at http://www.cygwin.com/
If you are using Cygwin or MinGW together with the MSYS environment, you
can build the library using configure (see "Unix ports" and
"Windows using configure" below). You can also
build wxWidgets without configure using native makefile, but only with
MinGW. Using Cygwin together with Windows makefile is no longer supported.
If building with MinGW without configure:
-> Set your path so that it includes the directory
where your compiler and tools reside
-> Make sure you have GNU Make installed. It must be Windows native version.
Download it from http://www.mingw.org, the executable will be called
mingw32-make.exe.
-> Modern version of MinGW is required; preferably MinGW 2.0 (with gcc3),
but MinGW with gcc-2.95.3 will suffice. If you are using 2.95, you will
have to change variable GCC_VERSION in config.gcc (see msw/install.txt
for details).
If using configure, Unix instructions apply.
c) Build instructions
Assumming that you installed the wxWidgets sources
into c:\wxWidgets:
-> Copy c:\wxWidgets\include\wx\msw\setup0.h
to c:\wxWidgets\include\wx\msw\setup.h
-> Edit c:\wxWidgets\include\wx\msw\setup.h to choose
the features you would like to compile wxWidgets with[out].
and std iostreams are disabled with
#define wxUSE_STD_IOSTREAM 0
-> type: cd c:\wxWidgets\build\msw
-> type: make -f makefile.gcc (if using GNU tools)
or type: nmake -f makefile.vc (if using MS VC++)
etc.
See also docs/msw/install.txt for additional compilation options.
d) Borland (including free command line tools)
Download tools from http://www.borland.com/downloads/
See docs/msw/install.txt for details; in brief:
-> type cd c:\wxWidgets\build\msw
-> type make -f makefile.bcc
You can customize many things in the build process, detailed description is
in docs/msw/install.txt.
II) Unix ports
--------------
Building wxGTK or wxMotif completely without configure
won't ever work, but there is now a new makefile system
that works without libtool and automake, using only
configure to create what is needed.
In order to create configure, you need to have the
GNU autoconf package (version > 2.54) installed
on your system and type run "autoconf" in the base
directory (or run the autogen.sh script in the same
directory, which just calls autoconf). Note that you usually don't
need to do this because configure is included in CVS.
Set WXWIN environment variable to the base directory such
as ~/wxWidgets (this is actually not really needed).
-> type: export WXWIN=~/wxWidgets
-> type: md mybuild
-> type: cd mybuild
-> type: ../configure --with-motif
or type: ../configure --with-gtk
-> type: make
-> type: su <type root password>
-> type: make install
-> type: ldconfig
-> type: exit
Call configure with --disable-shared to create a static
library. Calling "make uninstall" will remove the installed
library and "make dist" will create a distribution (not
yet complete).
III) Windows using configure
----------------------------------------
wxWidgets can be built on Windows using MSYS (see
http://www.mingw.org/), which is a POSIX build environment
for Windows. With MSYS you can just ./configure && make (see also VII,
Unix->Windows cross-compiling using configure).
Of course, you can also build the library using plain makefiles (see
section I).
IV) Classic MacOS using CodeWarrior (eg MacOS 8.x/9.x)
----------------------------------------
Refer to the readme.txt and install.txt files in docs/mac to build
wxWidgets under Classic Mac OS using CodeWarrior.
If you are checking out the CVS sources using cvs under Mac OS X and
compiling under Classic Mac OS:
- make sure that all text files have a Mac OS type of 'TEXT' otherwise
CodeWarrior may ignore them. Checking out the CVS sources using cvs
under Mac OS X creates untyped files which can lead to compilation
errors under CodeWarrior which are hard to track down.
- convert the xml files to CodeWarrior binary projects using the supplied
AppleScript in docs/mac (M5xml2mcp.applescript for CodeWarrior 5.3)
V) MacOS X using configure and the Developer Tools
----------------------------------------
You need to have the Developer Tools installed. If this is not the case,
you will need to register at the Apple Developer web site (this is a free
registration) in order to download the Developer Tools installer.
In order to create configure, you need to have the
GNU autoconf package (version >= 2.54) installed
on your system and type run "autoconf" in the base
directory (or run the autogen.sh script in the same
directory, which just calls autoconf).
-> type: mkdir macbuild
-> type: cd macbuild
-> type: ../configure --with-mac
or type: ../configure
-> type: make
VI) OS/2
----------------------------------------
No notes.
VII) Unix->Windows cross-compiling using configure
--------------------------------------------------
First you'll need a cross-compiler; linux glibc binaries of MinGW and
Cygwin (both based on egcs) can be found at
ftp://ftp.objsw.com/pub/crossgcc/linux-x-win32. Alternative binaries,
based on the latest MinGW release can be found at
http://members.telering.at/jessich/mingw/mingwcross/mingw_cross.html
Otherwise you can compile one yourself.
[ A Note about Cygwin and MinGW: the main difference is that Cygwin
binaries are always linked against cygwin.dll. This dll encapsulates most
standard Unix C extensions, which is very handy if you're porting unix
software to windows. However, wxMSW doesn't need this, so MinGW is
preferable if you write portable C(++). ]
You might want to build both Unix and Windows binaries in the same source
tree; to do this make subdirs for each e.g. unix and win32. If you've
already build wxWidgets in the main dir, do a 'make distclean' there,
otherwise configure will get confused. (In any case, read the section 'Unix
using configure' and make sure you're able to build a native wxWidgets
library; cross-compiling errors can be pretty obscure and you'll want to be
sure that your configure setup is basically sound.)
To cross compile the windows library, do
-> cd win32
(or whatever you called it)
Now run configure. There are two ways to do this
-> ../configure --host=i586-mingw32 --build=i586-linux --with-mingw
where --build= should read whatever platform you're building on. Configure
will notice that build and host platforms differ, and automatically prepend
i586-mingw32- to gcc, ar, ld, etc (make sure they're in the PATH!).
The other way to run configure is by specifying the names of the binaries
yourself:
-> CC=i586-mingw32-gcc CXX=i586-mingw32-g++ RANLIB=i586-mingw32-ranlib \
DLLTOOL=i586-mingw32-dlltool LD=i586-mingw32-ld NM=i586-mingw32-nm \
../configure --host=i586-mingw32 --with-mingw
(all assuming you're using MinGW)
By default this will compile a DLL, if you want a static library,
specify --disable-shared.
Type
-> make
and wait, wait, wait. Don't leave the room, because the minute you do there
will be a compile error :-)
NB: if you are using a very old compiler you risk to get quite a few warnings
about "ANSI C++ forbids implicit conversion from 'void *'" in all places
where va_arg macro is used. This is due to a bug in (some versions of)
MinGW headers which may be corrected by upgrading your compier,
otherwise you might edit the file
${install_prefix}/lib/gcc-lib/i586-mingw32/egcs-2.91.57/include/stdarg.h
(instead of egcs-2.91.57 you may have something different), searching for
the lines
/* Define __gnuc_va_list. */
#ifndef __GNUC_VA_LIST
#define __GNUC_VA_LIST
#if defined(__svr4__) || defined(_AIX) || defined(_M_UNIX) || defined(__NetBSD__)
typedef char *__gnuc_va_list;
#else
typedef void *__gnuc_va_list;
#endif
#endif
and adding "|| defined(_WIN32)" to the list of platforms on which
__gnuc_va_list is char *.
If this is successful, you end up with a wx23_2.dll/libwx23_2.a in win32/lib
(or just libwx_msw.a if you opted for a static build).
Now try building the minimal sample:
-> cd samples/minimal
-> make
and run it with wine, for example (or copy to a Windows box)
-> wine minimal.exe
If all is well, do an install; from win32
-> make install
Native and cross-compiled installations can co-exist peacefully
(as long as their widget sets differ), except for wx-config. You might
want to rename the cross-compiled one to i586-mingw32-wx-config, or something.
Cross-compiling TODO:
---------------------
- resource compiling must be done manually for now (should/can we link the
default wx resources into libwx_msw.a?) [ No we can't; the linker won't
link it in... you have to supply an object file ]
- static executables are HUGE -- there must be room for improvement.

25924
Makefile.in

File diff suppressed because it is too large Load Diff

View File

@@ -1,729 +0,0 @@
dnl ---------------------------------------------------------------------------
dnl
dnl Macros for configure.in for wxWindows by Robert Roebling, Phil Blecker,
dnl Vadim Zeitlin and Ron Lee
dnl
dnl This script is under the wxWindows licence.
dnl
dnl Version: $Id$
dnl ---------------------------------------------------------------------------
dnl ===========================================================================
dnl Objective-C(++) related macros
dnl ===========================================================================
m4_define([AC_WX_LANG_OBJECTIVEC],
[AC_LANG(C)
ac_ext=m
])
m4_define([AC_WX_LANG_OBJECTIVECPLUSPLUS],
[AC_LANG(C++)
ac_ext=mm
])
dnl ===========================================================================
dnl macros to find the a file in the list of include/lib paths
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_INCLUDES(search path, header name), sets ac_find_includes
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_INCLUDES],
[
ac_find_includes=
for ac_dir in $1 /usr/include;
do
if test -f "$ac_dir/$2"; then
ac_find_includes=$ac_dir
break
fi
done
])
dnl ---------------------------------------------------------------------------
dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
dnl to the full name of the file that was found or leaves it empty if not found
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES],
[
ac_find_libraries=
for ac_dir in $1;
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/lib$2.$ac_extension"; then
ac_find_libraries=$ac_dir
break 2
fi
done
done
])
dnl ---------------------------------------------------------------------------
dnl return list of standard library paths
dnl ---------------------------------------------------------------------------
dnl return all default locations:
dnl - /usr/lib: standard
dnl - /usr/lib32: n32 ABI on IRIX
dnl - /usr/lib64: n64 ABI on IRIX
dnl - /usr/lib/64: 64 bit ABI on Solaris and Linux x86-64
dnl
dnl NB: if any of directories in the list is not a subdir of /usr, code setting
dnl wx_cv_std_libpath needs to be updated
AC_DEFUN([WX_STD_LIBPATH], [/usr/lib /usr/lib32 /usr/lib/64 /usr/lib64])
dnl ---------------------------------------------------------------------------
dnl Path to include, already defined
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_INCLUDE_PATH_EXIST],
[
dnl never add -I/usr/include to the CPPFLAGS
if test "x$1" = "x/usr/include"; then
ac_path_to_include=""
else
echo "$2" | grep "\-I$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_include=""
else
ac_path_to_include=" -I$1"
fi
fi
])
dnl ---------------------------------------------------------------------------
dnl Usage: WX_LINK_PATH_EXIST(path, libpath)
dnl
dnl Set ac_path_to_link to nothing if path is already in libpath of to -Lpath
dnl if it is not, so that libpath can be set to "$libpath$ac_path_to_link"
dnl after calling this function
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_LINK_PATH_EXIST],
[
dnl never add -L/usr/libXXX explicitely to libpath
if test "$1" = "default location"; then
ac_path_to_link=""
else
echo "$2" | grep "\-L$1" > /dev/null
result=$?
if test $result = 0; then
ac_path_to_link=""
else
ac_path_to_link=" -L$1"
fi
fi
])
dnl ===========================================================================
dnl C++ features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_CPP_NEW_HEADERS checks whether the compiler has "new" <iostream> header
dnl or only the old <iostream.h> one - it may be generally assumed that if
dnl <iostream> exists, the other "new" headers (without .h) exist too.
dnl
dnl call WX_CPP_NEW_HEADERS(actiof-if-true, action-if-false)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_NEW_HEADERS],
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_CHECK_HEADERS(iostream)
if test "$ac_cv_header_iostream" = "yes" ; then
ifelse([$1], , :, [$1])
else
ifelse([$2], , :, [$2])
fi
AC_LANG_RESTORE
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_BOOL checks whether the C++ compiler has a built in bool type
dnl
dnl call WX_CPP_BOOL - will define HAVE_BOOL if the compiler supports bool
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_BOOL],
[
AC_CACHE_CHECK([if C++ compiler supports bool], wx_cv_cpp_bool,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(
[
],
[
bool b = true;
return 0;
],
[
wx_cv_cpp_bool=yes
],
[
wx_cv_cpp_bool=no
]
)
AC_LANG_RESTORE
])
if test "$wx_cv_cpp_bool" = "yes"; then
AC_DEFINE(HAVE_BOOL)
fi
])
dnl ---------------------------------------------------------------------------
dnl WX_CPP_EXPLICIT checks whether the C++ compiler support the explicit
dnl keyword and defines HAVE_EXPLICIT if this is the case
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_CPP_EXPLICIT],
[
AC_CACHE_CHECK([if C++ compiler supports the explicit keyword],
wx_cv_explicit,
[
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
dnl do the test in 2 steps: first check that the compiler knows about the
dnl explicit keyword at all and then verify that it really honours it
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
],
[
return 0;
],
[
AC_TRY_COMPILE(
[
class Foo { public: explicit Foo(int) {} };
static void TakeFoo(const Foo& foo) { }
],
[
TakeFoo(17);
return 0;
],
wx_cv_explicit=no,
wx_cv_explicit=yes
)
],
wx_cv_explicit=no
)
AC_LANG_RESTORE
])
if test "$wx_cv_explicit" = "yes"; then
AC_DEFINE(HAVE_EXPLICIT)
fi
])
dnl ---------------------------------------------------------------------------
dnl a slightly better AC_C_BIGENDIAN macro which allows cross-compiling
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_C_BIGENDIAN],
[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian,
[ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
bogus endian macros
#endif], [# It does; now see whether it defined to BIG_ENDIAN or not.
AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/param.h>], [
#if BYTE_ORDER != BIG_ENDIAN
not big endian
#endif], ac_cv_c_bigendian=yes, ac_cv_c_bigendian=no)])
if test $ac_cv_c_bigendian = unknown; then
AC_TRY_RUN([main () {
/* Are we little or big endian? From Harbison&Steele. */
union
{
long l;
char c[sizeof (long)];
} u;
u.l = 1;
exit (u.c[sizeof (long) - 1] == 1);
}], [ac_cv_c_bigendian=no], [ac_cv_c_bigendian=yes], [ac_cv_c_bigendian=unknown])
fi])
if test $ac_cv_c_bigendian = unknown; then
AC_MSG_WARN([Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file])
fi
if test $ac_cv_c_bigendian = yes; then
AC_DEFINE(WORDS_BIGENDIAN)
fi
])
dnl ---------------------------------------------------------------------------
dnl override AC_ARG_ENABLE/WITH to cache the results in .cache file
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_ARG_CACHE_INIT],
[
wx_arg_cache_file="configarg.cache"
echo "loading argument cache $wx_arg_cache_file"
rm -f ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}.tmp
touch ${wx_arg_cache_file}
])
AC_DEFUN([WX_ARG_CACHE_FLUSH],
[
echo "saving argument cache $wx_arg_cache_file"
mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
])
dnl this macro checks for a three-valued command line --with argument:
dnl possible arguments are 'yes', 'no', 'sys', or 'builtin'
dnl usage: WX_ARG_SYS_WITH(option, helpmessage, variable-name)
AC_DEFUN([WX_ARG_SYS_WITH],
[
AC_MSG_CHECKING([for --with-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
ac_cv_use_$1='$3=yes'
elif test "$withval" = no; then
ac_cv_use_$1='$3=no'
elif test "$withval" = sys; then
ac_cv_use_$1='$3=sys'
elif test "$withval" = builtin; then
ac_cv_use_$1='$3=builtin'
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
elif test "$$3" = no; then
AC_MSG_RESULT(no)
elif test "$$3" = sys; then
AC_MSG_RESULT([system version])
elif test "$$3" = builtin; then
AC_MSG_RESULT([builtin version])
else
AC_MSG_ERROR([Invalid value for --with-$1: should be yes, no, sys, or builtin])
fi
])
dnl this macro checks for a command line argument and caches the result
dnl usage: WX_ARG_WITH(option, helpmessage, variable-name, [withstring])
AC_DEFUN([WX_ARG_WITH],
[
withstring=$4
AC_MSG_CHECKING([for --${withstring:-with}-$1])
no_cache=0
AC_ARG_WITH($1, [$2],
[
if test "$withval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl like WX_ARG_WITH but uses AC_ARG_ENABLE instead of AC_ARG_WITH
dnl usage: WX_ARG_ENABLE(option, helpmessage, variable-name, enablestring)
dnl
dnl enablestring is a hack and allows to show "checking for --disable-foo"
dnl message when running configure instead of the default "checking for
dnl --enable-foo" one whih is useful for the options enabled by default
AC_DEFUN([WX_ARG_ENABLE],
[
enablestring=$4
AC_MSG_CHECKING([for --${enablestring:-enable}-$1])
no_cache=0
AC_ARG_ENABLE($1, [$2],
[
if test "$enableval" = yes; then
ac_cv_use_$1='$3=yes'
else
ac_cv_use_$1='$3=no'
fi
],
[
LINE=`grep "$3" ${wx_arg_cache_file}`
if test "x$LINE" != x ; then
eval "DEFAULT_$LINE"
else
no_cache=1
fi
ac_cv_use_$1='$3='$DEFAULT_$3
])
eval "$ac_cv_use_$1"
if test "$no_cache" != 1; then
echo $ac_cv_use_$1 >> ${wx_arg_cache_file}.tmp
fi
if test "$$3" = yes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
])
dnl ===========================================================================
dnl Linker features test
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl WX_VERSIONED_SYMBOLS checks whether the linker can create versioned
dnl symbols. If it can, sets LDFLAGS_VERSIONING to $CXX flags needed to use
dnl version script file named versionfile
dnl
dnl call WX_VERSIONED_SYMBOLS(versionfile)
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_VERSIONED_SYMBOLS],
[
found_versioning=no
dnl FIXME - doesn't work, Solaris linker doesn't accept wildcards
dnl in the script.
dnl dnl Check for known non-gcc cases:
dnl case "${host}" in
dnl *-*-solaris2* )
dnl if test "x$GCC" != "xyes" ; then
dnl LDFLAGS_VERSIONING="-M $1"
dnl found_versioning=yes
dnl fi
dnl ;;
dnl esac
dnl Generic check for GCC or GCC-like behaviour (Intel C++, GCC):
if test $found_versioning = no ; then
AC_CACHE_CHECK([if the linker accepts --version-script], wx_cv_version_script,
[
echo "VER_1 { *; };" >conftest.sym
echo "int main() { return 0; }" >conftest.cpp
if AC_TRY_COMMAND([
$CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr]) ; then
if test -s conftest.stderr ; then
wx_cv_version_script=no
else
wx_cv_version_script=yes
fi
else
wx_cv_version_script=no
fi
dnl There's a problem in some old linkers with --version-script that
dnl can cause linking to fail when you have objects with vtables in
dnl libs 3 deep. This is known to happen in netbsd and openbsd with
dnl ld 2.11.2.
dnl
dnl To test for this we need to make some shared libs and
dnl unfortunately we can't be sure of the right way to do that. If the
dnl first two compiles don't succeed then it looks like the test isn't
dnl working and the result is ignored, but if OTOH the first two
dnl succeed but the third does not then the bug has been detected and
dnl the --version-script flag is dropped.
if test $wx_cv_version_script = yes
then
echo "struct B { virtual ~B() { } }; \
struct D : public B { }; \
void F() { D d; }" > conftest.cpp
if AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest1.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym >/dev/null 2>/dev/null]) &&
AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest2.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym conftest1.output >/dev/null 2>/dev/null])
then
if AC_TRY_COMMAND([
$CXX -shared -fPIC -o conftest3.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
-Wl,--version-script,conftest.sym conftest2.output conftest1.output >/dev/null 2>/dev/null])
then
wx_cv_version_script=yes
else
wx_cv_version_script=no
fi
fi
fi
rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
rm -f conftest1.output conftest2.output conftest3.output
])
if test $wx_cv_version_script = yes ; then
LDFLAGS_VERSIONING="-Wl,--version-script,$1"
fi
fi
])
dnl ===========================================================================
dnl "3rd party" macros included here because they are not widely available
dnl ===========================================================================
dnl ---------------------------------------------------------------------------
dnl test for availability of iconv()
dnl ---------------------------------------------------------------------------
dnl From Bruno Haible.
AC_DEFUN([AM_ICONV],
[
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
dnl those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix],
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
done
])
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_func_iconv=yes)
if test "$am_cv_func_iconv" != yes; then
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
AC_TRY_LINK([#include <stdlib.h>
#include <iconv.h>],
[iconv_t cd = iconv_open("","");
iconv(cd,NULL,NULL,NULL,NULL);
iconv_close(cd);],
am_cv_lib_iconv=yes
am_cv_func_iconv=yes)
LIBS="$am_save_LIBS"
fi
])
if test "$am_cv_func_iconv" = yes; then
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const,
AC_TRY_COMPILE([
#include <stdlib.h>
#include <iconv.h>
extern
#ifdef __cplusplus
"C"
#endif
#if defined(__STDC__) || defined(__cplusplus)
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
#else
size_t iconv();
#endif
],
[],
wx_cv_func_iconv_const="no",
wx_cv_func_iconv_const="yes"
)
)
iconv_const=
if test "x$wx_cv_func_iconv_const" = "xyes"; then
iconv_const="const"
fi
AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const,
[Define as const if the declaration of iconv() needs const.])
fi
LIBICONV=
if test "$am_cv_lib_iconv" = yes; then
LIBICONV="-liconv"
fi
AC_SUBST(LIBICONV)
])
dnl ---------------------------------------------------------------------------
dnl AC_SYS_LARGEFILE (partly based on the code from autoconf 2.5x)
dnl ---------------------------------------------------------------------------
dnl WX_SYS_LARGEFILE_TEST
dnl
dnl NB: original autoconf test was checking if compiler supported 6 bit off_t
dnl arithmetic properly but this failed miserably with gcc under Linux
dnl whereas the system still supports 64 bit files, so now simply check
dnl that off_t is big enough
define(WX_SYS_LARGEFILE_TEST,
[typedef struct {
unsigned int field: sizeof(off_t) == 8;
} wxlf;
])
dnl WX_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR)
define(WX_SYS_LARGEFILE_MACRO_VALUE,
[
AC_CACHE_CHECK([for $1 value needed for large files], [$3],
[
AC_TRY_COMPILE([#define $1 $2
#include <sys/types.h>],
WX_SYS_LARGEFILE_TEST,
[$3=$2],
[$3=no])
]
)
if test "$$3" != no; then
wx_largefile=yes
AC_DEFINE_UNQUOTED([$1], [$$3])
fi
])
dnl AC_SYS_LARGEFILE
dnl ----------------
dnl By default, many hosts won't let programs access large files;
dnl one must use special compiler options to get large-file access to work.
dnl For more details about this brain damage please see:
dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
AC_DEFUN([AC_SYS_LARGEFILE],
[AC_ARG_ENABLE(largefile,
[ --disable-largefile omit support for large files])
if test "$enable_largefile" != no; then
dnl _FILE_OFFSET_BITS==64 is needed for Linux, Solaris, ...
dnl _LARGE_FILES -- for AIX
wx_largefile=no
WX_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64, ac_cv_sys_file_offset_bits)
if test "x$wx_largefile" != "xyes"; then
WX_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, ac_cv_sys_large_files)
fi
AC_MSG_CHECKING(if large file support is available)
if test "x$wx_largefile" = "xyes"; then
AC_DEFINE(HAVE_LARGEFILE_SUPPORT)
fi
AC_MSG_RESULT($wx_largefile)
fi
])
dnl Available from the GNU Autoconf Macro Archive at:
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_const_cast.html
dnl
AC_DEFUN([AC_CXX_CONST_CAST],
[AC_CACHE_CHECK(whether the compiler supports const_cast<>,
ac_cv_cxx_const_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE(,[int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;],
ac_cv_cxx_const_cast=yes, ac_cv_cxx_const_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_const_cast" = yes; then
AC_DEFINE(HAVE_CONST_CAST,,[define if the compiler supports const_cast<>])
fi
])
dnl http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_reinterpret_cast.html
AC_DEFUN([AC_CXX_REINTERPRET_CAST],
[AC_CACHE_CHECK(whether the compiler supports reinterpret_cast<>,
ac_cv_cxx_reinterpret_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0;};
class Derived : public Base { public : Derived () {} virtual void f () {} };
class Unrelated { public : Unrelated () {} };
int g (Unrelated&) { return 0; }],[
Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);],
ac_cv_cxx_reinterpret_cast=yes, ac_cv_cxx_reinterpret_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_reinterpret_cast" = yes; then
AC_DEFINE(HAVE_REINTERPRET_CAST,,
[define if the compiler supports reinterpret_cast<>])
fi
])
dnl and http://www.gnu.org/software/ac-archive/htmldoc/ac_cxx_static_cast.html
AC_DEFUN([AC_CXX_STATIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports static_cast<>,
ac_cv_cxx_static_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0; };
class Derived : public Base { public : Derived () {} virtual void f () {} };
int g (Derived&) { return 0; }],[
Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);],
ac_cv_cxx_static_cast=yes, ac_cv_cxx_static_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_static_cast" = yes; then
AC_DEFINE(HAVE_STATIC_CAST,, [define if the compiler supports static_cast<>])
fi
])
dnl http://autoconf-archive.cryp.to/ac_cxx_dynamic_cast.html
AC_DEFUN([AC_CXX_DYNAMIC_CAST],
[AC_CACHE_CHECK(whether the compiler supports dynamic_cast<>,
ac_cv_cxx_dynamic_cast,
[AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <typeinfo>
class Base { public : Base () {} virtual void f () = 0;};
class Derived : public Base { public : Derived () {} virtual void f () {} };],[
Derived d; Base& b=d; return dynamic_cast<Derived*>(&b) ? 0 : 1;],
ac_cv_cxx_dynamic_cast=yes, ac_cv_cxx_dynamic_cast=no)
AC_LANG_RESTORE
])
if test "$ac_cv_cxx_dynamic_cast" = yes; then
AC_DEFINE(HAVE_DYNAMIC_CAST,,[define if the compiler supports dynamic_cast<>])
fi
])

23
aclocal.m4 vendored
View File

@@ -1,23 +0,0 @@
# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
m4_include([build/aclocal/bakefile-lang.m4])
m4_include([build/aclocal/bakefile.m4])
m4_include([build/aclocal/cppunit.m4])
m4_include([build/aclocal/gtk-2.0.m4])
m4_include([build/aclocal/gtk.m4])
m4_include([build/aclocal/pkg.m4])
m4_include([build/aclocal/sdl.m4])
m4_include([build/aclocal/ax_func_which_gethostbyname_r.m4])
m4_include([build/aclocal/ac_raf_func_which_getservbyname_r.m4])
m4_include([acinclude.m4])

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *addbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #00C000",
" c None",
/* pixels */
" ....... ",
" .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" ...... .XXXXX. ",
" ...... .XXXXX. ",
" .. .XXXXX. ",
" .. .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * back_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" .XX........ ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" .XX........ ",
" .X. ",
" .. ",
" . ",
" "};

View File

@@ -1,57 +0,0 @@
/* XPM */
static char *cdrom_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"= c #9BACC2",
"y c #547B99",
"$ c #FFFFFF",
"@ c #839CB5",
"o c #547897",
"4 c #4D7492",
"% c #F1F4F7",
"X c #5A809C",
"< c #8497A5",
"0 c #7898AD",
"+ c #CAD2DC",
"r c #ACAEB2",
"2 c #BECAD9",
"* c #65839D",
"e c #DCE2EA",
"- c #ADBED2",
"t c #597B9A",
" c None",
"1 c #467291",
"9 c #D6DFE7",
"O c #7393AB",
"u c #49708B",
"5 c #A0BACB",
"& c #AABFCD",
"8 c #B9CBD5",
"; c #B4C4D3",
": c #6F90A6",
"3 c #A8B6CA",
"# c #ADBACE",
"w c #E4E9ED",
". c #8EA9BC",
"> c #B3BFD1",
", c #C2CBDB",
"6 c #C0D1DC",
"7 c #A2B3C5",
"q c #5D7C93",
/* pixels */
" .XooOo+ ",
" X@#$$$%o& ",
" *=-;$$$$$o+ ",
" +O#;-$$$$$$: ",
" o=>,-<1<$2-o ",
" o3>--1$122-* ",
" o=--$<4<22-X ",
" o5$$$$$26;7* ",
" X%$$$$2;-X8 ",
" 90*9$$$-7Xqo ",
" wXwe@O44X4<r<o ",
" X8628>22222<<*4",
" ttyyyoo4441uuuo",
" t>$$$$$$$$$$$>o",
" XXXtyyyoo44411u"
};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *copy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"o c #97C4E7",
"* c #FFFFFF",
"@ c #60A9DA",
"= c #D1E5F5",
"& c #C3DDF1",
". c #7EA6C0",
" c None",
"X c #2F93CD",
"O c #85BBE2",
", c #EFF6FC",
"; c #DEEDF8",
"+ c #72B2DD",
"3 c #F7FBFD",
"4 c #FAFCFE",
": c #DAEAF7",
"< c #E9F3FA",
"1 c #E2EFF8",
"- c #FDFDFE",
"% c #B6D5EE",
"$ c #A5CCEA",
"> c #E5F0F9",
"# c #AFD1EC",
"2 c #F4F9FD",
/* pixels */
" .....XX ",
" .oO+@X#X ",
" .$oO+X##X ",
" .%$o........ ",
" .&%$.*=&#o.-. ",
" .=&%.*;=&#.--. ",
" .:=&.*>;=&.... ",
" .>:=.*,>;=&#o. ",
" .<1:.*2,>:=&#. ",
" .2<1.*32,>:=&. ",
" .32<.*432,>:=. ",
" .32<.*-432,>:. ",
" .....**-432,>. ",
" .***-432,. ",
" .......... "
};

View File

@@ -1,17 +0,0 @@
/* XPM */
static char *cross_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
" c Gray0",
"# c None",
/* pixels */
" ######## ",
" #### ",
"# ## #",
"## ##",
"### ###",
"### ###",
"## ##",
"# ## #",
" #### ",
" ###### "};

View File

@@ -1,46 +0,0 @@
/* XPM */
static char *cut_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"6 c #D8BDC0",
": c #C3C3C4",
"- c #FFFFFF",
". c #6C6D70",
"2 c #AD3A45",
"o c #DBDBDB",
"# c #939495",
"< c #E42234",
"& c #C3C5C8",
"; c #C6CCD3",
"% c #B7B7B8",
" c None",
"* c #DFE0E2",
"5 c #B69596",
"3 c #9C2A35",
"1 c #CFCFD0",
", c #AB5C64",
"+ c #D2D3D4",
"$ c #BCBDBE",
"@ c #C6C8CA",
"> c #CDC0C1",
"O c #826F72",
"X c #979BA0",
"4 c #9B8687",
"= c #9FA0A0",
/* pixels */
" .X .o ",
" O.+ @. ",
" O. .. ",
" O#$ %.& ",
" O.*.. ",
" #%#.. ",
" O=-.. ",
" #%#;. ",
" OO:=O ",
" >,,<, ,<,,1 ",
" ><23<1 1<32<1 ",
" ,2 4< <5 2, ",
" <, ,2 2, ,< ",
" 23,<5 5<,32 ",
" 6225 522> "
};

View File

@@ -1,54 +0,0 @@
/* XPM */
static char *deffile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 32 1",
"= c #97C4E7",
": c #72A8D2",
"1 c #FFFFFF",
"w c #839CB5",
"X c #6B98B8",
". c #5A89A6",
"@ c #3A749C",
", c #D1E5F5",
"< c #67A1CF",
"> c #F1F4F7",
"e c #85A7BC",
"% c #C3DDF1",
"0 c #749BB4",
"2 c #7EA6C0",
"; c #5F9BC8",
" c None",
"O c #538DB3",
"- c #85BBE2",
"$ c #D6DFE7",
"9 c #EFF6FC",
"o c #6591AE",
"4 c #F7FBFD",
"8 c #FAFCFE",
"6 c #DAEAF7",
"7 c #E9F3FA",
"q c #FDFDFE",
"3 c #E2EFF8",
"# c #8EA9BC",
"& c #B6D5EE",
"* c #A5CCEA",
"5 c #F4F9FD",
"+ c #4581AA",
/* pixels */
" ..XooO+@#$ ",
" .%%&*=-;:;> ",
" .,,%&*=<1=X> ",
" #%%%%&*211=X ",
" #3-----<oXoO ",
" #3456,%&*=-O ",
" #3--------=O ",
" #355736,%&*o ",
" #3--------&o ",
" #38459736,%X ",
" #3--------,0 ",
" #31q84597360 ",
" #3--------3w ",
" #3111q84597e ",
" ##########e# ",
" "
};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *delbookm_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
" c None",
"X c #FF4040",
/* pixels */
" ....... ",
" .XXXXX. ",
" . . .XXXXX. ",
" .. .. .XXXXX. ",
" ... .XXXXX. ",
" . .XXXXX. ",
" ... .XXXXX. ",
" .. .. .XXXXX. ",
" . . .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XXXXX. ",
" .XX.XX. ",
" .X. .X. ",
" .. .. "
};

View File

@@ -1,42 +0,0 @@
/* XPM */
static char *delete_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"2 c #A5AEBD",
"* c #5478B4",
"< c #95A3BB",
"O c #9AA7BC",
"; c #758EB7",
"$ c #6986B6",
"# c #4971B2",
"& c #8A9CBA",
"X c #8598B9",
" c None",
"o c #ABB2BE",
"- c #7F95B9",
"= c #4E74B3",
"1 c #A0ABBC",
"+ c #6F8AB7",
". c #B5B9BF",
"@ c #3E69B1",
", c #90A0BA",
": c #6483B5",
"> c #5A7BB4",
"% c #5F7FB5",
/* pixels */
" ",
" .Xo OO ",
" +@#. $@% ",
" &@@X .*@*o ",
" =@= .*@*. ",
" -@@X*@*. ",
" .#@@@$. ",
" ;@@: ",
" ;@@@+ ",
" .>@#%@@. ",
" o*@*oO@@, ",
" <#@*. .@@= ",
"&@@$ :@@1 ",
";#& 2#>. ",
" "
};

View File

@@ -1,52 +0,0 @@
/* XPM */
static char *dir_up_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",
"o c #9AEA53",
"7 c #94A5BD",
"8 c #547897",
"5 c #839CB5",
"@ c #376485",
"$ c #5A809C",
"# c #7F99B4",
": c #D1D9E5",
"< c #EAEDF3",
"& c #446A8C",
"q c #65839D",
"> c #DCE2EA",
", c #E1E6EE",
"2 c #F5F6F7",
"O c #8DA0B9",
" c None",
"% c #467291",
". c #305F81",
"X c #7393AB",
"+ c #6A89A2",
"4 c #A8B6CA",
"1 c #EEF1F3",
"3 c #F8F9FA",
"0 c #215579",
"9 c #7F97B0",
"* c #B3BFD1",
"w c #7A90AC",
"- c #C2CBDB",
"; c #CAD6E1",
"= c #BBC4D6",
/* pixels */
" .. ",
" X.o. ",
".... X.ooo. ",
".OO+....ooooo. ",
".OOOOOO@@ooo.. ",
".OOOO#OO@ooo.$ ",
".OOOOOOO@ooo.$ ",
".O%............&",
".O&*=-;:>,<1231.",
".+.4*=-;:>,<12$.",
"..564*=-;:>,<1. ",
".@O764*=-;:>,<. ",
".89O764*=-;:>$$ ",
"0qw9O764*=-;:. ",
"0............. "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * down_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ...... ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" ....XXXX.... ",
" .XXXXXXXX. ",
" .XXXXXX. ",
" .XXXX. ",
" .XX. ",
" .. ",
" "};

View File

@@ -1,73 +0,0 @@
/* XPM */
static char *exefile_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 51 1",
"% c #E8E8EC",
"= c #E8E8ED",
"z c #CACAD4",
"8 c #D9D9E1",
"p c #D2D2DA",
"u c #E1E1E7",
"a c #D2D2DB",
"< c #E9E9ED",
"q c #DADAE1",
"+ c #F1F1F4",
"g c #D3D3DB",
"1 c #E2E2E8",
"x c #D3D3DC",
"5 c #00A5FF",
"$ c #EAEAEE",
"4 c #DBDBE2",
"h c #CCCCD6",
"y c #D4D4DC",
"r c #E3E3E9",
"d c #D4D4DD",
"7 c #DCDCE2",
": c #EBEBEF",
"0 c #DCDCE3",
" c None",
"O c #F3F3F5",
"> c #E4E4E9",
"& c #F3F3F6",
"j c #D5D5DD",
"6 c #E4E4EA",
". c #C6C6D5",
"# c #ECECF0",
"f c #CECED7",
"l c #CECED8",
"e c #D6D6DE",
"; c #EDEDF0",
"3 c #DEDEE4",
", c #EDEDF1",
"c c #CFCFD8",
"o c #F5F5F7",
"- c #E6E6EB",
"w c #D7D7DF",
"v c #C8C8D3",
"i c #DFDFE5",
"@ c #EEEEF2",
"s c #D0D0D9",
"X c #9494AD",
"9 c #D8D8DF",
"t c #D8D8E0",
"* c #EFEFF2",
"2 c #E0E0E6",
"k c #D1D1DA",
/* pixels */
" ........X ",
" .oO+@#$%XX ",
" .&+*#$=-XXX ",
" .+*;:=->XXXX ",
" .*,:<->1234X ",
" .,5:5612378X ",
" 5,5559530qwX ",
" 55555550q9eX ",
" 5555r5555teyX ",
" 55rui559eypX ",
" 5555i5555yasX ",
" 5555555dasfX ",
" 5355595gsfhX ",
" .3595jgklhzX ",
" .0qwjxkchzvX ",
" XXXXXXXXXXXX "
};

View File

@@ -1,57 +0,0 @@
/* XPM */
static char *fileopen_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 36 1",
"6 c #9BACC2",
"< c #9AEA53",
"9 c #94A5BD",
"5 c #839CB5",
"; c #4D7492",
". c #376485",
"$ c #7F99B4",
"r c #D1D9E5",
"7 c #EAEDF3",
"@ c #CAD2DC",
"% c #718BA7",
"t c #BECAD9",
"& c #65839D",
"0 c #DCE2EA",
"4 c #F5F6F7",
"w c #597B9A",
"O c #8DA0B9",
" c None",
"+ c #467291",
"u c #305F81",
"= c #B4C4D3",
"# c #CAE2AA",
"1 c #FAFCFE",
"3 c #A8B6CA",
"q c #E4E9ED",
"8 c #EEF1F3",
"X c #215579",
"2 c #7F97B0",
": c #B3BFD1",
"y c #7A90AC",
", c #C2CBDB",
"- c #ADD668",
"* c #B6D791",
"e c #CAD6E1",
"o c #DFF0D0",
"> c #BBC4D6",
/* pixels */
" ",
" .... ",
"XXXXX .oo. ",
"XOOOO+@.#o. ",
"XOOOO$%&.*oXXX ",
"XOOOOOOO.*oX=X ",
"XOXXXX...-oXXXX;",
"XOX:>,.<<<<<oX1;",
"X2X3:>,.<<<oX4=;",
"XX563:>>.<oX78; ",
"XXO963:>>.X0q7; ",
"Xw2O963:>>er0t; ",
"X&y2O963:>,er; ",
"uXXXXXXXXXXXX; ",
" "
};

View File

@@ -1,42 +0,0 @@
/* XPM */
static char *filesave_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 21 1",
"O c #FFFFFF",
"> c #D5D6D8",
"; c #446A8C",
"1 c #CAD2DC",
": c #C0C7D1",
" c #5F666D",
"% c #A5B0BA",
"o c #65839D",
", c #DCE2EA",
"< c #C3C5C8",
"- c #E1E6EE",
"* c #C6CCD3",
". c None",
"$ c #305F81",
"2 c #D6DFE7",
"= c #D2D9E0",
"& c #B7BFC7",
"X c #1B4467",
"# c #BCBDBE",
"@ c #7A90AC",
"+ c #5D7C93",
/* pixels */
" .",
" XoOOOOOOOOO+X .",
" @oO#######O+@ .",
" @oOOOOOOOOO+@ .",
" @oO#######O+@ .",
" @oOOOOOOOOO+@ .",
" @@+++++++++@@ .",
" @@@@@@@@@@@@@ .",
" @@@$$$$$$$$@@ .",
" @@$%%%&*=-O$@ .",
" @@$%X;;*=-O$@ .",
" @@$%X;;:>,O$@ .",
" @@$%X;;<12O$@ .",
" @@$<<2OOOOO$@ .",
". .."
};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *filesaveas_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"X c Black",
"+ c #FFFFFF",
"< c #D5D6D8",
"> c #446A8C",
"3 c #CAD2DC",
", c #C0C7D1",
" c #5F666D",
"* c #A5B0BA",
"O c #65839D",
"1 c #DCE2EA",
"2 c #C3C5C8",
": c #E1E6EE",
". c #FFFF00",
"- c #C6CCD3",
"@ c None",
"& c #305F81",
"4 c #D6DFE7",
"; c #D2D9E0",
"= c #B7BFC7",
"o c #1B4467",
"$ c #BCBDBE",
"# c #7A90AC",
"% c #5D7C93",
/* pixels */
" .X .XX.",
" oO+++++++.X.X.@",
" #O+$$$$$XX...XX",
" #O++++++.......",
" #O+$$$$$XX...XX",
" #O+++++++.X.X.@",
" ##%%%%%%.X%.X .",
" ############# @",
" ###&&&&&&&&## @",
" ##&***=-;:+&# @",
" ##&*o>>-;:+&# @",
" ##&*o>>,<1+&# @",
" ##&*o>>234+&# @",
" ##&224+++++&# @",
"@ @@"
};

View File

@@ -1,62 +0,0 @@
/* XPM */
static char *find_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 41 1",
"y c #A06959",
"9 c #A7DAF2",
"$ c #B5CAD7",
"> c #35B4E1",
"t c #6B98B8",
"w c #B6E0F4",
"q c #AEC9D7",
"1 c #5A89A6",
"+ c #98B3C6",
"4 c #EAF6FC",
"3 c #DEF1FA",
"= c #4CBCE3",
"d c #DB916B",
"X c #85A7BC",
"s c #D8BCA4",
"o c #749BB4",
"e c #BCD9EF",
"* c #62B4DD",
"< c #91D2EF",
"a c #E6DED2",
"0 c #E9F4FB",
" c None",
"@ c #A0BACB",
"O c #AABFCD",
"i c #6591AE",
": c #B9CBD5",
"- c #71C5E7",
"5 c #D3ECF8",
"% c #81A3B9",
"6 c #8AD0EE",
"8 c #FDFDFE",
"p c #8EA9BC",
"r c #B6D5EE",
", c #81CCEB",
". c #ACC4D3",
"; c #AFD1DE",
"7 c #EFF8FC",
"u c #C2CBDB",
"# c #C0D1DC",
"2 c #CAD6E1",
"& c #8FB0C3",
/* pixels */
" .XooXO ",
" +@###$+% ",
" .&#*==-;@@ ",
" o:*>,<--:X ",
" 12>-345-#% ",
" 12>678392% ",
" %$*,3059q& ",
" @Oq,wwer@@ ",
" t@q22q&+ ",
" yyui+%o%p ",
" yasy ",
" yasdy ",
" yasdy ",
" ysdy ",
" yy "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *findrepl_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 42 1",
"y c #A06959",
"9 c #A7DAF2",
"$ c #B5CAD7",
"> c #35B4E1",
"t c #6B98B8",
"w c #B6E0F4",
"q c #AEC9D7",
"1 c #5A89A6",
"+ c #98B3C6",
"4 c #EAF6FC",
"d c #008000",
"3 c #DEF1FA",
"= c #4CBCE3",
"f c #DB916B",
"X c #85A7BC",
"s c #D8BCA4",
"o c #749BB4",
"e c #BCD9EF",
"* c #62B4DD",
"< c #91D2EF",
"a c #E6DED2",
"0 c #E9F4FB",
" c None",
"@ c #A0BACB",
"O c #AABFCD",
"i c #6591AE",
": c #B9CBD5",
"- c #71C5E7",
"5 c #D3ECF8",
"% c #81A3B9",
"6 c #8AD0EE",
"8 c #FDFDFE",
"p c #8EA9BC",
"r c #B6D5EE",
", c #81CCEB",
". c #ACC4D3",
"; c #AFD1DE",
"7 c #EFF8FC",
"u c #C2CBDB",
"# c #C0D1DC",
"2 c #CAD6E1",
"& c #8FB0C3",
/* pixels */
" .XooXO ",
" +@###$+% ",
" .&#*==-;@@ ",
" o:*>,<--:X ",
" 12>-345-#% ",
" 12>678392% ",
" %$*,3059q& ",
" @Oq,wwer@@ ",
" t@q22q&+ ",
" yyui+%o%p ",
" yasy d d ",
" yasfy dd dd ",
"yasfy ddddddddd",
"ysfy dd dd ",
" yy d d "
};

View File

@@ -1,39 +0,0 @@
/* XPM */
static char *floppy_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 18 1",
"& c #E3E4E6",
"+ c #FFFFFF",
". c #446A8C",
"o c #697787",
"> c #5F666D",
"* c #B2B3B3",
" c None",
", c #4B4C4D",
"= c #DCDBDA",
"$ c #1B4467",
": c #E4E9ED",
"@ c #979BA0",
"X c #203646",
"O c #215579",
"- c #545B63",
"; c #636465",
"# c #CAD6E1",
"% c #7F8286",
/* pixels */
" .XoooooooXO ",
" .o+++++++.O ",
" .o+OOOOO+.O ",
" .o+++++++.O ",
" .o@@@@@@@.O ",
" ..........O ",
" ..#+++++#.O ",
" ..+$O+++#.O ",
" ..+$O+++#.O ",
" %&.........*% ",
"%=+++++++++++&% ",
"--------------; ",
"-:::::::::::::- ",
"-:X:XXXXXXXXX:> ",
"-*************, "
};

View File

@@ -1,43 +0,0 @@
/* XPM */
static char *folder_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"> c #9BACC2",
". c #547897",
"1 c #7F99B4",
"X c #D1D9E5",
"< c #EAEDF3",
"+ c #CAD2DC",
"3 c #718BA7",
"O c #BECAD9",
"$ c #E1E6EE",
"* c #F5F6F7",
", c #8DA0B9",
" c None",
"# c #D6DFE7",
"@ c #D2D9E0",
"- c #FAFCFE",
"; c #ADBACE",
"& c #EEF1F3",
"= c #F8F9FA",
"o c #B3BFD1",
"2 c #7A90AC",
": c #A2B3C5",
"% c #E5EAF1",
/* pixels */
" ",
" ..... ",
" .XXXX. ",
" ............. ",
" .oO+@#$%&*=-. ",
" .oO+@#$%&*=-. ",
" .;oO+X#$%&*=. ",
" .:;oO+X#$%&*. ",
" .>:;oO+X#$%&. ",
" .,>:;oO+X#$<. ",
" .1,>:;oO+X#$. ",
" .21,>:;oO+X#. ",
" .321,>:;oO+X. ",
" ............. ",
" "
};

View File

@@ -1,52 +0,0 @@
/* XPM */
static char *folder_open_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 31 1",
"6 c #9BACC2",
"w c #547B99",
"5 c #94A5BD",
". c #376485",
"; c #F1F4F7",
"o c #7F99B4",
"2 c #D1D9E5",
"- c #EAEDF3",
"O c #718BA7",
"0 c #65839D",
"* c #DCE2EA",
": c #F5F6F7",
"7 c #597B9A",
"X c #8DA0B9",
" c None",
"+ c #467291",
"q c #305F81",
"& c #D6DFE7",
"3 c #6A89A2",
"1 c #A8B6CA",
"= c #E4E9ED",
"> c #F8F9FA",
", c #FDFDFE",
"9 c #215579",
"8 c #7F97B0",
"@ c #B3BFD1",
"< c #7A90AC",
"$ c #C2CBDB",
"4 c #A2B3C5",
"% c #CAD6E1",
"# c #BBC4D6",
/* pixels */
" ",
"..... ",
".XXXo. ",
".XXXXO........ ",
".XXXXXXXXXXXX. ",
".XXXXXXXXXXXX. ",
".X++++++++++++++",
".X+@#$%&*=-;:>,+",
".<.1@#$%2*=-;:23",
"..X41@#$%2*=-;3 ",
"..X561@#$%2*=-3 ",
".78X561@#$%2*%3 ",
"90<8X561@#$%23 ",
"q++++++++++++w ",
" "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * forward_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" ",
" . ",
" .. ",
" .X. ",
" ........XX. ",
" .XXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXXX. ",
" .XXXXXXXXXX. ",
" ........XX. ",
" .X. ",
" .. ",
" . ",
" "};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",
"X c #242424",
"o c #DCDF00",
". c #C00000",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ............. ",
" ................. ",
" ................... ",
" ....................... ",
" ......................... ",
" ........................... ",
" ...........................X ",
" .............................X ",
" ............................... ",
" ...............................X ",
" .................................X ",
" .................................X ",
" .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ",
" .................................XX ",
" ...............................XXX ",
" ...............................XXX ",
" .............................XXX ",
" ...........................XXXX ",
" ...........................XXX ",
" .........................XXX ",
" .......................XXXX ",
" X...................XXXXX ",
" X.................XXXXX ",
" X.............XXXXX ",
" XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ",
" XXXXX ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,75 +0,0 @@
/* XPM */
static char *question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",
"> c #696969",
"O c #1F1F00",
"+ c #181818",
"o c #F6F900",
"; c #3F3F00",
"$ c #111111",
" c None",
"& c #202020",
"X c #AAAA00",
"@ c #949400",
": c #303030",
"1 c #383838",
"% c #2A2A00",
", c #404040",
"= c #B4B400",
"- c #484848",
"# c #151500",
"< c #9F9F00",
"2 c #6A6A00",
"* c #353500",
/* pixels */
" ",
" ",
" ",
" ",
" ......... ",
" ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ",
" +.XoooooX.. ",
" ,.Xoooooo<.. ",
" 1#XooooooXO.. ",
" &#XooooooX2.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" &.XooooooXX.. ",
" .XooooooXX.. ",
" &.XoooooXX.. ",
" ..XooooXX.. ",
" ..XooooX... ",
" ..XXooXX..& ",
" ...XXXXX.. ",
" ........ ",
" ",
" ",
" ....... ",
" ..XXXXX.. ",
" ..XXoooXX.. ",
" ..XoooooX.. ",
" ..XoooooX.. ",
" ..XXoooXX.. ",
" ..XXXXX.. ",
" ....... ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",
"o c #A6A800",
"+ c #8A8C00",
"$ c #B8BA00",
" c None",
"O c #6E7000",
"X c #DCDF00",
". c #C00000",
"# c #373800",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ... ",
" ... ",
" ..... ",
" ...X.. ",
" ..XXX.. ",
" ...XXX... ",
" ..XXXXX.. ",
" ..XXXXXX... ",
" ...XXoO+XX.. ",
" ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ",
" .............................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,60 +0,0 @@
/* XPM */
static char *harddisk_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"7 c #E3E4E6",
"4 c #FFFFFF",
"5 c #839CB5",
". c #547897",
"1 c #4D7492",
"@ c #376485",
"o c #7A92A3",
"u c #D1D9E5",
"y c #446A8C",
"i c #51B03D",
"> c #CAD2DC",
"O c #718BA7",
"2 c #65839D",
"6 c #DCE2EA",
"0 c #C3C5C8",
"9 c #F5F6F7",
": c #EBEBEC",
"< c #597B9A",
"t c #C6CCD3",
" c None",
"* c #DFE0E2",
"e c #467291",
"a c #526E8B",
", c #7393AB",
"p c #130A0B",
"# c #AABFCD",
"r c #B4C4D3",
"; c #CFCFD0",
"X c #6F90A6",
"+ c #6A89A2",
"- c #D2D3D4",
"= c #DCDBDA",
"w c #E4E9ED",
"q c #C6C8CA",
"% c #215579",
"$ c #E7E7E7",
"3 c #7F97B0",
"8 c #C0D1DC",
"& c #5D7C93",
/* pixels */
" ",
" .XoooXO+@ ",
" #$$%%%%$$$X ",
" &$*==-;$$$& ",
" &:>+,<1234o5 ",
" ###+67;;78242 ",
" &4,49*0q*9we4. ",
" &4+49*,,*9wo4. ",
"&4%r,67;;782t%4.",
"&44468rrrr84444,",
"y11111111111111e",
"1uu1:::::::::::1",
"1uu1::::::::ip:1",
"auu&:::::::::::1",
"1111111111111111"
};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *helpicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 6 1",
" c Gray0",
". c Blue",
"X c #808080808080",
"o c #c0c0c0c0c0c0",
"O c Gray100",
"+ c None",
/* pixels */
"+++++++++++XXXXXXXX+++++++++++++",
"++++++++XXXoOOOOOOoXXX++++++++++",
"++++++XXoOOOOOOOOOOOOoXX++++++++",
"+++++XoOOOOOOOOOOOOOOOOoX+++++++",
"++++XOOOOOOOOOOOOOOOOOOOO ++++++",
"+++XOOOOOOOo......oOOOOOOO +++++",
"++XOOOOOOOo.oOO....oOOOOOOO ++++",
"+XoOOOOOOO..OOOO....OOOOOOOo +++",
"+XOOOOOOOO....OO....OOOOOOOO X++",
"XoOOOOOOOO....Oo....OOOOOOOOo X+",
"XOOOOOOOOOo..oO....OOOOOOOOOO X+",
"XOOOOOOOOOOOOOo...OOOOOOOOOOO XX",
"XOOOOOOOOOOOOO...OOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..oOOOOOOOOOOOO XX",
"XOOOOOOOOOOOOO..OOOOOOOOOOOOO XX",
"XoOOOOOOOOOOOOOOOOOOOOOOOOOOo XX",
"+XOOOOOOOOOOOo..oOOOOOOOOOOO XXX",
"+XoOOOOOOOOOO....OOOOOOOOOOo XXX",
"++XOOOOOOOOOO....OOOOOOOOOO XXX+",
"+++ OOOOOOOOOo..oOOOOOOOOO XXXX+",
"++++ OOOOOOOOOOOOOOOOOOOO XXXX++",
"+++++ oOOOOOOOOOOOOOOOOo XXXX+++",
"++++++ oOOOOOOOOOOOOo XXXX++++",
"+++++++X oOOOOOOo XXXXX+++++",
"++++++++XXX oOOO XXXXXXX++++++",
"++++++++++XXXX OOO XXXXX++++++++",
"+++++++++++++X OOO XX+++++++++++",
"+++++++++++++++ OO XX+++++++++++",
"++++++++++++++++ O XX+++++++++++",
"+++++++++++++++++ XX+++++++++++",
"++++++++++++++++++XXX+++++++++++",
"+++++++++++++++++++XX+++++++++++"
};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *home_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
". c Black",
"X c #FFFFFF",
" c None",
/* pixels */
" .... ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXXXX. ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .X.....X....X. ",
" .X. .X. .X. ",
" .X. .X. .X. ",
" .X.....X. .X. ",
" .XXXXXXX. .X. ",
" ......... ... "
};

View File

@@ -1,25 +0,0 @@
/* XPM */
static char * htmbook_xpm[] = {
"16 16 6 1",
" c None",
". c Black",
"X c #000080",
"o c #c0c0c0",
"O c #808080",
"+ c Gray100",
" ",
" .. ",
" ..XX. ",
" ..XXXXX. ",
" ..XXXXXXXX. ",
".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ",
" .XXXXo..O++o..",
" .XXX.O+++o.. ",
" .XX.o+o.. ",
" .X.o.. ",
" ... "};

View File

@@ -1,25 +0,0 @@
/* XPM */
static char * htmfoldr_xpm[] = {
"16 16 6 1",
" c None",
". c Black",
"X c #000080",
"o c #c0c0c0",
"O c #808080",
"+ c Gray100",
" ",
" .. ",
" ..XX. ",
" ..XXXXX. ",
" ..XXXXXXXX. ",
".oXXXXXXXXXX. ",
".XoXXXXXXXXXX. ",
".XXoXXXXXXXXXX. ",
".XXXoXXXXXXXXX..",
".XXXXoXXXXXX..O ",
" .XXXXoXXX..O+O ",
" .XXXXo..O++o..",
" .XXX.O+++o.. ",
" .XX.o+o.. ",
" .X.o.. ",
" ... "};

View File

@@ -1,20 +0,0 @@
/* XPM */
static char * htmoptns_xpm[] = {
"16 15 2 1",
" c None",
". c #000000",
" ",
" .. ",
" ... ",
" .... ",
" . ... ",
" .. ... ",
" . .. ",
" .. ... ",
" . .. ",
" ......... ",
" .. ... ",
" . ... ",
" .. ... ",
" .... ....... ",
" "};

View File

@@ -1,23 +0,0 @@
/* XPM */
static char * htmpage_xpm[] = {
"16 16 4 1",
" c None",
". c #808080",
"X c Gray100",
"o c Black",
" ",
" .......... ",
" .XXXXXXXX.. ",
" .XXXXXXXXooo ",
" .X......XXXo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .X........Xo ",
" .XXXXXXXXXXo ",
" .XXXXXXXXXXo ",
" oooooooooooo "};

View File

@@ -1,27 +0,0 @@
/* XPM */
static char *htmsidep_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 6 1",
". c Black",
"X c #FFFFFF",
"+ c #808080",
" c None",
"O c #0000C0",
"o c #C0C0C0",
/* pixels */
" ",
" .............. ",
" .XXXX.ooooooo. ",
" .XOXX.oo...oo. ",
" .XXOX.ooooooo. ",
" .OOOO.o...+.o. ",
" .XXOX.ooooooo. ",
" .XOXX.ooooooo. ",
" .XXXX.o..+ooo. ",
" .XXOX.ooooooo. ",
" .XOXX.o...+.o. ",
" .OOOO.ooooooo. ",
" .XOXX.o.+...o. ",
" .XXOX.ooooooo. ",
" .............. "
};

View File

@@ -1,25 +0,0 @@
/* XPM */
static char *listview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 4 1",
" c Black",
". c #FFFFFF",
"X c #000084",
"o c #848484",
/* pixels */
" ",
" .............. ",
" .XXX.......... ",
" .XXX. o o . ",
" .XXX.......... ",
" .............. ",
" .XXX.......... ",
" .XXX. o . ",
" .XXX.......... ",
" .............. ",
" .XXX.......... ",
" .XXX. o o . ",
" .XXX.......... ",
" .............. ",
" "
};

View File

@@ -1,43 +0,0 @@
/* XPM */
static char *missimg_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 5 1",
"X c Black",
"o c #FFFFFF",
" c None",
". c #C0C0C0",
"O c #E0E0E0",
/* pixels */
" .............................X ",
" .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOXOOOOOOOOOOOOOOOOooX ",
" XXXOOOOOXX XOOOOOOOOOOOOOOOooX ",
" XXXXX XOOOOOOOOOOOOOOooX ",
" XOOOXXXOOOOOOOooX ",
" XXX XXOOOOOooX ",
" XOOOOooX ",
" . XOOOooX ",
" .. XXOooX ",
" .o.. XooX ",
" .ooO... XXX ",
" .ooOOOO.......... ",
" .ooOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOO.. ",
" .ooOOOOOOOOOOOOOOOOOO......... ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooOOOOOOOOOOOOOOOOOOOOOOOOooX ",
" .ooooooooooooooooooooooooooooX ",
" .ooooooooooooooooooooooooooooX ",
" XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX "
};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *error_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 4 1",
" c None",
"X c #242424",
"o c #DCDF00",
". c #C00000",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ............. ",
" ................. ",
" ................... ",
" ....................... ",
" ......................... ",
" ........................... ",
" ...........................X ",
" .............................X ",
" ............................... ",
" ...............................X ",
" .................................X ",
" .................................X ",
" .................................XX ",
" ...ooooooooooooooooooooooooooo...XX ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....X ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ....ooooooooooooooooooooooooooo....XX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" ...ooooooooooooooooooooooooooo...XXX ",
" .................................XX ",
" .................................XX ",
" ...............................XXX ",
" ...............................XXX ",
" .............................XXX ",
" ...........................XXXX ",
" ...........................XXX ",
" .........................XXX ",
" .......................XXXX ",
" X...................XXXXX ",
" X.................XXXXX ",
" X.............XXXXX ",
" XXXX.....XXXXXXXX ",
" XXXXXXXXXXXXX ",
" XXXXX ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *info_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,75 +0,0 @@
/* XPM */
static char *question_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 21 1",
". c Black",
"> c #696969",
"O c #1F1F00",
"+ c #181818",
"o c #F6F900",
"; c #3F3F00",
"$ c #111111",
" c None",
"& c #202020",
"X c #AAAA00",
"@ c #949400",
": c #303030",
"1 c #383838",
"% c #2A2A00",
", c #404040",
"= c #B4B400",
"- c #484848",
"# c #151500",
"< c #9F9F00",
"2 c #6A6A00",
"* c #353500",
/* pixels */
" ",
" ",
" ",
" ",
" ......... ",
" ...XXXXXXX.. ",
" ..XXXXoooooXXXO+ ",
" ..XXooooooooooooX@.. ",
" ..XoooooooooooooooXX#. ",
" $%XoooooooooooooooooXX#. ",
" &.XoooooooXXXXXXooooooXX.. ",
" .XooooooXX.$...$XXoooooX*. ",
" $.XoooooX%.$ .*oooooo=.. ",
" .XooooooX.. -.XoooooX.. ",
" .XoooooX..+ .XoooooX;. ",
" ...XXXX..: .XoooooX;. ",
" ........ >.XoooooX;. ",
" +.XoooooX.. ",
" ,.Xoooooo<.. ",
" 1#XooooooXO.. ",
" &#XooooooX2.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" $%XooooooXX.. ",
" &.XooooooXX.. ",
" .XooooooXX.. ",
" &.XoooooXX.. ",
" ..XooooXX.. ",
" ..XooooX... ",
" ..XXooXX..& ",
" ...XXXXX.. ",
" ........ ",
" ",
" ",
" ....... ",
" ..XXXXX.. ",
" ..XXoooXX.. ",
" ..XoooooX.. ",
" ..XoooooX.. ",
" ..XXoooXX.. ",
" ..XXXXX.. ",
" ....... ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,63 +0,0 @@
/* XPM */
static char *warning_xpm[] = {
/* columns rows colors chars-per-pixel */
"48 48 9 1",
"@ c Black",
"o c #A6A800",
"+ c #8A8C00",
"$ c #B8BA00",
" c None",
"O c #6E7000",
"X c #DCDF00",
". c #C00000",
"# c #373800",
/* pixels */
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ... ",
" ... ",
" ..... ",
" ...X.. ",
" ..XXX.. ",
" ...XXX... ",
" ..XXXXX.. ",
" ..XXXXXX... ",
" ...XXoO+XX.. ",
" ..XXXO@#XXX.. ",
" ..XXXXO@#XXX... ",
" ...XXXXO@#XXXX.. ",
" ..XXXXXO@#XXXX... ",
" ...XXXXXo@OXXXXX.. ",
" ...XXXXXXo@OXXXXXX.. ",
" ..XXXXXXX$@OXXXXXX... ",
" ...XXXXXXXX@XXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXX... ",
" ..XXXXXXXXXXOXXXXXXXXX.. ",
" ...XXXXXXXXXO@#XXXXXXXXX.. ",
" ..XXXXXXXXXXX#XXXXXXXXXX... ",
" ...XXXXXXXXXXXXXXXXXXXXXXX.. ",
" ...XXXXXXXXXXXXXXXXXXXXXXXX... ",
" .............................. ",
" .............................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "
};

View File

@@ -1,50 +0,0 @@
/* XPM */
static char *new_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 29 1",
"* c #97C4E7",
"- c #72A8D2",
": c #FFFFFF",
"9 c #839CB5",
"o c #6B98B8",
"X c #5A89A6",
"# c #3A749C",
", c #D1E5F5",
"0 c #85A7BC",
"$ c #C3DDF1",
"8 c #749BB4",
"; c #5F9BC8",
" c None",
"+ c #538DB3",
"= c #85BBE2",
"3 c #EFF6FC",
"O c #6591AE",
"5 c #F7FBFD",
"7 c #FAFCFE",
"< c #DAEAF7",
"4 c #E9F3FA",
"6 c #FDFDFE",
"1 c #E2EFF8",
". c #8EA9BC",
"% c #B6D5EE",
"& c #A5CCEA",
"> c #ACE95B",
"2 c #F4F9FD",
"@ c #4581AA",
/* pixels */
" .XoOO+@#. ",
" .$$%&*=O-; ",
" @@@@$%&*O:*o ",
" @>>@$$%&O::*o ",
"@@@>>@@@$%OOoO+ ",
"@>>>>>>@,$%&*=+ ",
"@>>>>>>@<,$%&*+ ",
"@@@>>@@@1<,$%&O ",
" @>>@2341<,$%O ",
" @@@@52341<,$o ",
" .:6752341<,8 ",
" .::6752341<8 ",
" .:::67523419 ",
" .::::6752340 ",
" ............ "
};

View File

@@ -1,43 +0,0 @@
/* XPM */
static char *new_dir_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 22 1",
"X c Black",
"> c #9BACC2",
"o c #547897",
"1 c #7F99B4",
"O c #D1D9E5",
"< c #EAEDF3",
"# c #CAD2DC",
"3 c #718BA7",
"@ c #BECAD9",
"& c #E1E6EE",
"; c #F5F6F7",
". c #FFFF00",
", c #8DA0B9",
" c None",
"% c #D6DFE7",
"$ c #D2D9E0",
"- c #ADBACE",
"= c #EEF1F3",
"+ c #B3BFD1",
"2 c #7A90AC",
": c #A2B3C5",
"* c #E5EAF1",
/* pixels */
" .X .XX.",
" ooooo .X.X. ",
" oOOOOo XX...XX",
" oooooooo.......",
" o+@#$%&*XX...XX",
" o+@#$%&*=.X.X. ",
" o-+@#O%&.X;.X .",
" o:-+@#O%&*=;o ",
" o>:-+@#O%&*=o ",
" o,>:-+@#O%&<o ",
" o1,>:-+@#O%&o ",
" o21,>:-+@#O%o ",
" o321,>:-+@#Oo ",
" ooooooooooooo ",
" "
};

View File

@@ -1,46 +0,0 @@
/* XPM */
static char *paste_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 25 1",
"< c #FEECE4",
"> c #FEE3D7",
"O c #FFFFFF",
"o c #7B767D",
"% c #F79586",
"& c #CAE1F3",
"@ c #F08B62",
"# c #FCCBB8",
"- c #FDD8C9",
"4 c #FFF8F4",
"5 c #FFF5F0",
" c None",
"$ c #F8AA8F",
", c #EFF6FC",
"1 c #F7FBFD",
"2 c #FAFCFE",
"; c #DAEAF7",
": c #E9F3FA",
"6 c #FFFAF8",
". c #3C78A6",
"3 c #FFF1ED",
"X c #9B8687",
"+ c #FBBCA4",
"* c #B6D5EE",
"= c #F4F9FD",
/* pixels */
" ...... ",
" .XoOOOOoo. ",
".+XOOOOOOX@. ",
".+XXXXXXXX@. ",
".#++$$%@..... ",
".##++$$%.&*.=. ",
".-##++$$.;&.==. ",
".--##++$.:;.... ",
".>--##++.,:;&*. ",
".<>--##+.1,:;&. ",
".<<>--##.21,:;. ",
".3<<>--#.O21=:. ",
".45<<>--....... ",
".6453<>----. ",
"............ "
};

View File

@@ -1,60 +0,0 @@
/* XPM */
static char *print_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 39 1",
"< c #E3E4E6",
"+ c #C3C3C4",
"i c #FFFFFF",
": c #74879B",
"# c #5A89A6",
"a c #F1F4F7",
"r c #5A809C",
"@ c #BDCCD9",
"e c #7A92A4",
"% c #3F6F93",
"t c #9FA2A6",
"3 c #939495",
"w c #5F666D",
"9 c #65839E",
"5 c #4A7291",
"$ c #4B7F9E",
" c None",
"O c #DFE0E2",
"o c #F3F3F3",
"; c #84A5BB",
"& c #467291",
". c #7897AD",
"* c #407598",
"4 c #CFCFD0",
"7 c #6F90A6",
"y c #6A89A2",
"0 c #AAADB2",
"1 c #D2D3D4",
"u c #4F7592",
", c #BCBDBE",
"p c #57778E",
"q c #979BA0",
"2 c #ABABAC",
"- c #E7E7E7",
"= c #D6DEE6",
"> c #9FA0A0",
"8 c #829EB5",
"X c #8FB0C3",
"6 c #5D7C93",
/* pixels */
" .XXXXXXXX ",
" .oooooooX ",
" .OOOOOOOX ",
" .+++++++X ",
"@##$%&&&&&%*##@ ",
"$=-;:>,<123$-=$ ",
".44.5678.96$44. ",
"7,,,,,,,,,,,,,7 ",
"900qwwwwwwwe009 ",
"rtt9ryyyyyyuttr ",
"6qq6iiiiiii%qq6 ",
"633paiiiiii%336 ",
"XXX*iiiiiii%XXX ",
" 6iiiiiii% ",
" $XXXXXXX# "
};

View File

@@ -1,90 +0,0 @@
/* XPM */
static char *quit_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 69 1",
"@ c Black",
"i c #9AEA53",
"D c #7E9BB1",
"H c #839FB4",
", c #B7C7D3",
"8 c #BCCBD6",
"7 c #C1CFDA",
"v c #92ABBD",
"- c #D0DBE2",
"O c #547897",
"+ c #376485",
"L c #7090A8",
"t c #AEC0CE",
"g c #B3C4D1",
"S c #84A0B4",
"G c #89A4B8",
"> c #BDCCD7",
"F c #5A809C",
"2 c #C2D0DA",
"k c #93ACBE",
"= c #D6E0E6",
"* c #446A8C",
"z c #A5B9C8",
"# c #DEE5EB",
"0 c #AFC1CE",
"r c #B4C5D2",
"p c #B9C9D5",
"A c #8AA5B8",
"M c #92AABD",
"j c #A6BAC9",
"K c #7796AC",
"l c #ABBECC",
"o c #E4EAEF",
"9 c #B5C6D2",
" c None",
"; c #C9D6DF",
"X c #305F81",
"m c #98AFC0",
"V c #9DB3C3",
"% c #D1DBE3",
"u c #A2B7C6",
"y c #A7BBCA",
"h c #ACBFCD",
"4 c #B6C7D3",
"w c #C0CFD9",
"d c #982106",
"B c #85A0B5",
"6 c #C8D4DE",
"c c #99B0C1",
"x c #9EB4C4",
"$ c #D7E0E7",
"q c #A8BCCA",
"s c #ADC0CD",
"3 c #BCCCD7",
"N c #8BA5B9",
": c #C4D1DB",
"1 c #C9D5DE",
"f c #9AB1C2",
"n c #A4B9C8",
"a c #B3C5D1",
". c #215579",
"J c #7D9AB0",
"& c #829EB5",
"e c #BBCAD6",
"b c #8CA6B9",
"Z c #91AABC",
"C c #96AEC0",
"< c #CFDAE2",
"5 c #AFC2CF",
/* pixels */
" ..XXXXXXXXXX ",
" XoO+X@@@@@@X ",
" X#$%&X*@@@@X ",
" X=-;:>,X@@@X ",
" X<12345X@@@X ",
" X67890qX@XXX ",
" XwertyuX@XiX ",
" XpasddfX++iiX ",
" XghjddkXiiiiiX ",
" XlzxcvbXiiiiiiX",
" XnxmMNBXiiiiiX ",
" XVCZASDXXXiiX ",
" XXFGHJKX XiX ",
" FXXFLX XX ",
" XX* "
};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *redo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",
"; c #4C7398",
"3 c #547B99",
"* c #547897",
"# c #5A89A6",
"8 c #3A749C",
"5 c #5A809C",
", c #7F99B4",
"& c #3F6F93",
"9 c #85A7BC",
"+ c #749BB4",
"> c #718BA7",
"e c #A5B3C8",
"w c #BECAD9",
": c #65839D",
"u c #E1E6EE",
"o c #236289",
"r c #ADBED2",
"= c #597B9A",
"2 c #8DA0B9",
" c None",
"% c #467291",
"1 c #7393AB",
"i c #4C809F",
"- c #A0BACB",
"O c #6591AE",
"X c #407598",
"6 c #6F90A6",
"t c #D2D9E0",
"7 c #ADBACE",
"@ c #326A8F",
"0 c #467A9C",
". c #ACC4D3",
"< c #7F97B0",
"y c #B3BFD1",
"q c #A2B3C5",
"$ c #8FB0C3",
/* pixels */
" .XoooO ",
" +o@@@@@o# +",
" $@%%&@&%%&@ +o",
" X*=@+-+@*=;@#&@",
" @:=+ @=:=*:@",
" &>:$ @:>>>@",
" &,<X X>,,,&",
" +123 @<2222&",
" X44X #@56<44X",
" O1748 .9#&o",
" 0qwe8 ",
" 8rty8 ",
" 8wu+ ",
" i## ",
" "
};

View File

@@ -1,44 +0,0 @@
/* XPM */
static char *removable_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 23 1",
"@ c #C3C3C4",
"4 c #FFFFFF",
"o c #D5D6D8",
"> c #7A92A3",
". c #8497A5",
"% c #ACAEB2",
"2 c #4A7898",
": c #DCE2EA",
", c #F5F6F7",
"= c #EBEBEC",
"$ c #B7B7B8",
" c None",
"X c #DFE0E2",
"* c #A6A8AD",
"1 c #4C809F",
"3 c #407598",
"O c #CFCFD0",
"; c #9EA2A8",
"# c #BCBDBE",
"+ c #C6C8CA",
"- c #979BA0",
"& c #E7E7E7",
"< c #8FB0C3",
/* pixels */
" ......... ",
" .XoO+@#$%. ",
" .XoO+@#$%. ",
" .&XoO+@#$%*. ",
" .&XoO+@#$%*. ",
" .=&XoO+@#$%*-. ",
" .=&XoO+@#$%*;. ",
".:=&XoO+@#$%*;>.",
".,=&XoO+@#$%*;-.",
"<..............<",
"<,=&XoO+@#$%%%%.",
"<O1111122233*4*.",
"<OOOOOOOOOOO***.",
" <<<<<<<<<<<<<< ",
" "
};

View File

@@ -1,24 +0,0 @@
/* XPM */
static char *repview_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 3 1",
" c Black",
"X c #FFFFFF",
". c #C0C0C0",
/* pixels */
" ",
" .............. ",
" . . . . ",
" .............. ",
" .............. ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" X X X X ",
" XXXXXXXXXXXXXX ",
" "
};

View File

@@ -1,17 +0,0 @@
/* XPM */
static char *tick_xpm[] = {
/* columns rows colors chars-per-pixel */
"10 10 2 1",
". c Gray0",
" c None",
/* pixels */
" ",
" ..",
" ...",
" ... ",
".. ... ",
"... ... ",
" ..... ",
" ... ",
" . ",
" "};

View File

@@ -1,47 +0,0 @@
/* XPM */
static char *tipicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 9 1",
"$ c Black",
"O c #FFFFFF",
"@ c #808080",
"+ c #000080",
"o c #E8EB01",
" c None",
"X c #FFFF40",
"# c #C0C0C0",
". c #ABAD01",
/* pixels */
" ",
" ..... ",
" ..XXXXX.. ",
" ..XXXXXXXXo.. ",
" .XXXOXXXXXXXoo. ",
" .XOOXXX+XXXXXo. ",
" .XOOOXX+++XXXXoo. ",
" .XOOXXX+++XXXXXo. ",
" .XOOOXXX+++XXXXXXo. ",
" .XOOXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXXX. ",
" .XXXXXXX+++XXXXXXo. ",
" .XXXXXXX+++XXXXXoo. ",
" .XXXXXX+++XXXXXo. ",
" .XXXXXXX+XXXXXXo. ",
" .XXXXXXXXXXXXo. ",
" .XXXXX+++XXXoo. ",
" .XXXX+++XXoo. ",
" .XXXXXXXXo. ",
" ..XXXXXXo.. ",
" .XXXXXo.. ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@@@ ",
" @#######@ ",
" @@@@@@@ ",
" ### ",
" $$$ ",
" ",
" ",
" "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * toparent_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" .. ",
" .XX. ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" ....XXXX.... ",
" .XXXX. ",
" .XXXX..... ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .XXXXXXXX. ",
" .......... ",
" "};

View File

@@ -1,58 +0,0 @@
/* XPM */
static char *undo_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 15 37 1",
"4 c #9BACC2",
"* c #4C7398",
"2 c #547B99",
"- c #547897",
"@ c #5A89A6",
"8 c #3A749C",
"6 c #5A809C",
", c #7F99B4",
"$ c #3F6F93",
"7 c #85A7BC",
"+ c #749BB4",
"> c #718BA7",
"0 c #A5B3C8",
"q c #BECAD9",
": c #65839D",
"u c #E1E6EE",
"X c #236289",
"y c #ADBED2",
"= c #597B9A",
"1 c #8DA0B9",
" c None",
"% c #467291",
"3 c #7393AB",
"i c #4C809F",
"; c #A0BACB",
". c #6591AE",
"o c #407598",
"5 c #6F90A6",
"t c #D2D9E0",
"9 c #ADBACE",
"# c #326A8F",
"e c #467A9C",
"O c #ACC4D3",
"< c #7F97B0",
"r c #B3BFD1",
"w c #A2B3C5",
"& c #8FB0C3",
/* pixels */
" .XXXoO ",
"+ @X#####X+ ",
"X+ #$%%$#$%%#& ",
"#$@#*=-#+;+#=-o ",
"#:-=:=# +=:# ",
"#>>>:# &:>$ ",
"$,,,>o o<,$ ",
"$1111<# 213+ ",
"o44<56#@ o44o ",
"X$@7O 8493. ",
" 80qwe ",
" 8rty8 ",
" +uq8 ",
" @@i ",
" "
};

View File

@@ -1,21 +0,0 @@
/* XPM */
static char * up_xpm[] = {
"16 15 3 1",
" c None",
". c Black",
"X c Gray100",
" ",
" .. ",
" .XX. ",
" .XXXX. ",
" .XXXXXX. ",
" .XXXXXXXX. ",
" ....XXXX.... ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" .XXXX. ",
" ...... ",
" "};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1,25 +0,0 @@
/* XPM */
static char *wxwin16x16_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",
"X c #000084",
"o c #FFFFFF",
"O c #FFFF00",
"+ c #FF0000",
" ",
" ",
" ....... ",
" .XXXXX. ",
" .oXXXX. ",
" .oXXX.......",
".....oXXX.OOOOO.",
".+++.XXXX.oOOOO.",
".o++......oOOOO.",
".o++++. .oOOOO.",
".o++++. .OOOOO.",
".+++++. .......",
"....... ",
" ",
" ",
" "};

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -1,41 +0,0 @@
/* XPM */
static char *wxwin32x32_xpm[] = {
"32 32 6 1",
" c None",
". c #000000",
"X c #000084",
"o c #FFFFFF",
"O c #FFFF00",
"+ c #FF0000",
" ",
" ",
" ",
" ",
" ",
" .............. ",
" .XXXXXXXXXXXX. ",
" .XXXXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXXXXX. ",
" .XooXXXXXX..............",
" .XooXXXXXX.OOOOOOOOOOOO.",
".........XooXXXXXX.OOOOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+++++++.XooXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++.XXXXXXXXX.OooOOOOOOOOO.",
".+oo++++...........OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OooOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".+oo+++++++++. .OOOOOOOOOOOO.",
".++++++++++++. ..............",
".++++++++++++. ",
".............. ",
" ",
" ",
" ",
" ",
" "};

File diff suppressed because one or more lines are too long

View File

@@ -1,2 +0,0 @@
#!/bin/sh
autoconf

View File

@@ -1 +0,0 @@
wince

View File

@@ -1,27 +0,0 @@
autogen.mk
autogen.mk is a makefile provided to automatically update the GNU autotools
build system. It will run Bakefile, aclocal, and autoconf as appropriate.
The .m4 files required for running aclocal are located in build/aclocal.
When upgrading software that wxWidgets depends on (for example, Bakefile,
cppunit, GTK, SDL, or others) it is advisable to upgrade the .m4 files
located in the build/aclocal directory.
It is particularly important that if you use a newer version of Bakefile
to generate the Makefile.in files that you use the newer bakefile*.m4.
Because build/autogen.mk is a Makefile it will automatically rerun
aclocal and autoconf as necessary whenever any m4 in build/aclocal is
newer than the generated aclocal.m4.
You can achieve this simply by copying the new bakefile*.m4 files from
PREFIX/share/aclocal/ into the build/aclocal/ directory and
rerunning make -f build/autogen.mk. Note that you should _not_ preserve
source file times (don't use cp -p) or else it's possible your .m4 files
will be older than the generated aclocal.m4).
Example:
cp /usr/share/aclocal/bakefile*.m4 build/aclocal/
make -f build/autogen.mk
Please don't forget to commit updated .m4 files as well as updated aclocal.m4,
configure, and Makefile.in files to wxWidgets.

View File

@@ -1,66 +0,0 @@
dnl @synopsis AC_raf_FUNC_WHICH_GETSERVBYNAME_R
dnl
dnl Provides a test to determine the correct way to call
dnl getservbyname_r:
dnl
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_6 if it needs 6 arguments (e.g linux)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_5 if it needs 5 arguments (e.g. solaris)
dnl - defines HAVE_FUNC_GETSERVBYNAME_R_4 if it needs 4 arguments (e.g. osf/1)
dnl
dnl An example use can be found at
dnl http://raf.org/autoconf/net_getservbyname.c
dnl
dnl Based on Caolan McNamara's gethostbyname_r macro. Based on David
dnl Arnold's autoconf suggestion in the threads faq.
dnl
dnl @category Misc
dnl @author raf <raf@raf.org>
dnl @version 2001-08-20
dnl @license GPLWithACException
AC_DEFUN([AC_raf_FUNC_WHICH_GETSERVBYNAME_R],
[AC_CHECK_FUNC(getservbyname_r,
[AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se;
struct servent_data data;
(void) getservbyname_r(name, proto, se, &data);
],
ac_cv_func_which_getservbyname_r=four,
[AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se, *res;
char buffer[2048];
int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen, &res);
],
ac_cv_func_which_getservbyname_r=six,
[AC_TRY_COMPILE([#include <netdb.h>],
[
char *name;
char *proto;
struct servent *se;
char buffer[2048];
int buflen = 2048;
(void) getservbyname_r(name, proto, se, buffer, buflen)
],
ac_cv_func_which_getservbyname_r=five,
ac_cv_func_which_getservbyname_r=no
)]
)]
)],
ac_cv_func_which_getservbyname_r=no)
if test $ac_cv_func_which_getservbyname_r = six; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_6)
elif test $ac_cv_func_which_getservbyname_r = five; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_5)
elif test $ac_cv_func_which_getservbyname_r = four; then
AC_DEFINE(HAVE_FUNC_GETSERVBYNAME_R_4)
fi
])

View File

@@ -1,155 +0,0 @@
dnl @synopsis AX_FUNC_WHICH_GETHOSTBYNAME_R
dnl
dnl Determines which historical variant of the gethostbyname_r() call
dnl (taking three, five, or six arguments) is available on the system
dnl and defines one of the following macros accordingly:
dnl
dnl HAVE_FUNC_GETHOSTBYNAME_R_6
dnl HAVE_FUNC_GETHOSTBYNAME_R_5
dnl HAVE_FUNC_GETHOSTBYNAME_R_3
dnl
dnl If used in conjunction with gethostname.c, the API demonstrated in
dnl test.c can be used regardless of which gethostbyname_r() is
dnl available. These example files can be found at
dnl http://www.csn.ul.ie/~caolan/publink/gethostbyname_r
dnl
dnl based on David Arnold's autoconf suggestion in the threads faq
dnl
dnl Originally named "AC_caolan_FUNC_WHICH_GETHOSTBYNAME_R". Rewritten
dnl for Autoconf 2.5x by Daniel Richard G.
dnl
dnl @category InstalledPackages
dnl @author Caolan McNamara <caolan@skynet.ie>
dnl @author Daniel Richard G. <skunk@iskunk.org>
dnl @version 2005-01-21
dnl @license GPLWithACException
AC_DEFUN([AX_FUNC_WHICH_GETHOSTBYNAME_R], [
AC_LANG_PUSH(C)
AC_MSG_CHECKING([how many arguments gethostbyname_r() takes])
AC_CACHE_VAL(ac_cv_func_which_gethostbyname_r, [
################################################################
ac_cv_func_which_gethostbyname_r=unknown
#
# ONE ARGUMENT (sanity check)
#
# This should fail, as there is no variant of gethostbyname_r() that takes
# a single argument. If it actually compiles, then we can assume that
# netdb.h is not declaring the function, and the compiler is thereby
# assuming an implicit prototype. In which case, we're out of luck.
#
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
(void)gethostbyname_r(name) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=no)
#
# SIX ARGUMENTS
# (e.g. Linux)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret, *retp;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &retp, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=six)
fi
#
# FIVE ARGUMENTS
# (e.g. Solaris)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
char buf@<:@1024@:>@;
int buflen = 1024;
int my_h_errno;
(void)gethostbyname_r(name, &ret, buf, buflen, &my_h_errno) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=five)
fi
#
# THREE ARGUMENTS
# (e.g. AIX, HP-UX, Tru64)
#
if test "$ac_cv_func_which_gethostbyname_r" = "unknown"; then
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM(
[[#include <netdb.h>]],
[[
char *name = "www.gnu.org";
struct hostent ret;
struct hostent_data data;
(void)gethostbyname_r(name, &ret, &data) /* ; */
]]),
ac_cv_func_which_gethostbyname_r=three)
fi
################################################################
]) dnl end AC_CACHE_VAL
case "$ac_cv_func_which_gethostbyname_r" in
three)
AC_MSG_RESULT([three])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_3)
;;
five)
AC_MSG_RESULT([five])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_5)
;;
six)
AC_MSG_RESULT([six])
AC_DEFINE(HAVE_FUNC_GETHOSTBYNAME_R_6)
;;
no)
AC_MSG_RESULT([cannot find function declaration in netdb.h])
;;
unknown)
AC_MSG_RESULT([can't tell])
;;
*)
AC_MSG_ERROR([internal error])
;;
esac
AC_LANG_POP(C)
]) dnl end AC_DEFUN

View File

@@ -1,258 +0,0 @@
dnl ---------------------------------------------------------------------------
dnl Compiler detection macros by David Elliott
dnl ---------------------------------------------------------------------------
dnl ===========================================================================
dnl Macros to detect non-GNU compilers (MetroWerks, XLC)
dnl ===========================================================================
dnl Based on autoconf _AC_LANG_COMPILER_GNU
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_MWERKS],
[AC_CACHE_CHECK([whether we are using the Metrowerks _AC_LANG compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks],
[AC_TRY_COMPILE([],[#ifndef __MWERKS__
choke me
#endif
],
[bakefile_compiler_mwerks=yes],
[bakefile_compiler_mwerks=no])
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_mwerks=$bakefile_compiler_mwerks
])
])
dnl Loosely based on autoconf AC_PROG_CC
dnl TODO: Maybe this should wrap the call to AC_PROG_CC and be used instead.
AC_DEFUN([AC_BAKEFILE_PROG_MWCC],
[AC_LANG_PUSH(C)
_AC_BAKEFILE_LANG_COMPILER_MWERKS
MWCC=`test $bakefile_cv_c_compiler_mwerks = yes && echo yes`
AC_LANG_POP(C)
])
dnl Loosely based on autoconf AC_PROG_CXX
dnl TODO: Maybe this should wrap the call to AC_PROG_CXX and be used instead.
AC_DEFUN([AC_BAKEFILE_PROG_MWCXX],
[AC_LANG_PUSH(C++)
_AC_BAKEFILE_LANG_COMPILER_MWERKS
MWCXX=`test $bakefile_cv_cxx_compiler_mwerks = yes && echo yes`
AC_LANG_POP(C++)
])
dnl Based on autoconf _AC_LANG_COMPILER_GNU
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER_XLC],
[AC_CACHE_CHECK([whether we are using the IBM xlC _AC_LANG compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
[AC_TRY_COMPILE([],[#ifndef __xlC__
choke me
#endif
],
[bakefile_compiler_xlc=yes],
[bakefile_compiler_xlc=no])
bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$bakefile_compiler_xlc
])
])
dnl Loosely based on autoconf AC_PROG_CC
AC_DEFUN([AC_BAKEFILE_PROG_XLCC],
[AC_LANG_PUSH(C)
_AC_BAKEFILE_LANG_COMPILER_XLC
XLCC=`test $bakefile_cv_c_compiler_xlc = yes && echo yes`
AC_LANG_POP(C)
])
dnl Loosely based on autoconf AC_PROG_CXX
AC_DEFUN([AC_BAKEFILE_PROG_XLCXX],
[AC_LANG_PUSH(C++)
_AC_BAKEFILE_LANG_COMPILER_XLC
XLCXX=`test $bakefile_cv_cxx_compiler_xlc = yes && echo yes`
AC_LANG_POP(C++)
])
dnl Based on autoconf _AC_LANG_COMPILER_GNU
dnl _AC_BAKEFILE_LANG_COMPILER(NAME, LANG, SYMBOL, IF-YES, IF-NO)
AC_DEFUN([_AC_BAKEFILE_LANG_COMPILER],
[
AC_LANG_PUSH($2)
AC_CACHE_CHECK(
[whether we are using the $1 $2 compiler],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3],
[AC_TRY_COMPILE(
[],
[
#ifndef $3
choke me
#endif
],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=yes],
[bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3=no]
)
]
)
AC_LANG_POP($2)
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_compiler_[]$3" = "xyes"; then
:; $4
else
:; $5
fi
])
dnl recent versions of SGI mipsPro compiler define _SGI_COMPILER_VERSION
dnl
dnl NB: old versions define _COMPILER_VERSION but this could probably be
dnl defined by other compilers too so don't test for it to be safe
AC_DEFUN([AC_BAKEFILE_PROG_SGICC],
[
_AC_BAKEFILE_LANG_COMPILER(SGI, C, _SGI_COMPILER_VERSION, SGICC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_SGICXX],
[
_AC_BAKEFILE_LANG_COMPILER(SGI, C++, _SGI_COMPILER_VERSION, SGICXX=yes)
])
dnl Sun compiler defines __SUNPRO_C/__SUNPRO_CC
AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=yes)
])
dnl Intel icc compiler defines __INTEL_COMPILER for both C and C++
AC_DEFUN([AC_BAKEFILE_PROG_INTELCC],
[
_AC_BAKEFILE_LANG_COMPILER(Intel, C, __INTEL_COMPILER, INTELCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_INTELCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Intel, C++, __INTEL_COMPILER, INTELCXX=yes)
])
dnl HP-UX aCC: see http://docs.hp.com/en/6162/preprocess.htm#macropredef
AC_DEFUN([AC_BAKEFILE_PROG_HPCC],
[
_AC_BAKEFILE_LANG_COMPILER(HP, C, __HP_cc, HPCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_HPCXX],
[
_AC_BAKEFILE_LANG_COMPILER(HP, C++, __HP_aCC, HPCXX=yes)
])
dnl Tru64 cc and cxx
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCC],
[
_AC_BAKEFILE_LANG_COMPILER(Compaq, C, __DECC, COMPAQCC=yes)
])
AC_DEFUN([AC_BAKEFILE_PROG_COMPAQCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Compaq, C++, __DECCXX, COMPAQCXX=yes)
])
dnl ===========================================================================
dnl macros to detect specialty compiler options
dnl ===========================================================================
dnl Figure out if we need to pass -ext o to compiler (MetroWerks)
AC_DEFUN([AC_BAKEFILE_METROWERKS_EXTO],
[AC_CACHE_CHECK([if the _AC_LANG compiler requires -ext o], bakefile_cv_[]_AC_LANG_ABBREV[]_exto,
dnl First create an empty conf test
[AC_LANG_CONFTEST([AC_LANG_PROGRAM()])
dnl Now remove .o and .c.o or .cc.o
rm -f conftest.$ac_objext conftest.$ac_ext.o
dnl Now compile the test
AS_IF([AC_TRY_EVAL(ac_compile)],
dnl If the test succeeded look for conftest.c.o or conftest.cc.o
[for ac_file in `(ls conftest.* 2>/dev/null)`; do
case $ac_file in
conftest.$ac_ext.o)
bakefile_cv_[]_AC_LANG_ABBREV[]_exto="-ext o"
;;
*)
;;
esac
done],
[AC_MSG_FAILURE([cannot figure out if compiler needs -ext o: cannot compile])
]) dnl AS_IF
rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext
]) dnl AC_CACHE_CHECK
if test "x$bakefile_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
if test "[]_AC_LANG_ABBREV[]" = "c"; then
CFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
fi
if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
CXXFLAGS="$bakefile_cv_[]_AC_LANG_ABBREV[]_exto $CXXFLAGS"
fi
fi
]) dnl AC_DEFUN
dnl ===========================================================================
dnl Macros to do all of the compiler detections as one macro
dnl ===========================================================================
dnl check for different proprietary compilers depending on target platform
dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
[
AC_PROG_$1
AC_BAKEFILE_PROG_INTEL$1
dnl if we're using gcc, we can't be using any of incompatible compilers
if test "x$G$1" != "xyes"; then
if test "x$1" = "xC"; then
AC_BAKEFILE_METROWERKS_EXTO
if test "x$bakefile_cv_c_exto" '!=' "x"; then
unset ac_cv_prog_cc_g
_AC_PROG_CC_G
fi
fi
dnl most of these compilers are only used under well-defined OS so
dnl don't waste time checking for them on other ones
case `uname -s` in
AIX*)
AC_BAKEFILE_PROG_XL$1
;;
Darwin)
AC_BAKEFILE_PROG_MW$1
AC_BAKEFILE_PROG_XL$1
;;
IRIX*)
AC_BAKEFILE_PROG_SGI$1
;;
HP-UX*)
AC_BAKEFILE_PROG_HP$1
;;
OSF1)
AC_BAKEFILE_PROG_COMPAQ$1
;;
SunOS)
AC_BAKEFILE_PROG_SUN$1
;;
esac
fi
])
AC_DEFUN([AC_BAKEFILE_PROG_CC],
[
_AC_BAKEFILE_PROG_COMPILER(CC)
])
AC_DEFUN([AC_BAKEFILE_PROG_CXX],
[
_AC_BAKEFILE_PROG_COMPILER(CXX)
])

File diff suppressed because it is too large Load Diff

View File

@@ -1,80 +0,0 @@
dnl
dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl
AC_DEFUN([AM_PATH_CPPUNIT],
[
AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)],
cppunit_config_prefix="$withval", cppunit_config_prefix="")
AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)],
cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="")
if test x$cppunit_config_exec_prefix != x ; then
cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config
fi
fi
if test x$cppunit_config_prefix != x ; then
cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix"
if test x${CPPUNIT_CONFIG+set} != xset ; then
CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config
fi
fi
AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no)
cppunit_version_min=$1
AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min)
no_cppunit=""
if test "$CPPUNIT_CONFIG" = "no" ; then
no_cppunit=yes
else
CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG --cflags`
CPPUNIT_LIBS=`$CPPUNIT_CONFIG --libs`
cppunit_version=`$CPPUNIT_CONFIG --version`
cppunit_major_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_version=`echo $cppunit_version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_major_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
cppunit_minor_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
cppunit_micro_min=`echo $cppunit_version_min | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
cppunit_version_proper=`expr \
$cppunit_major_version \> $cppunit_major_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \> $cppunit_minor_min \| \
$cppunit_major_version \= $cppunit_major_min \& \
$cppunit_minor_version \= $cppunit_minor_min \& \
$cppunit_micro_version \>= $cppunit_micro_min `
if test "$cppunit_version_proper" = "1" ; then
AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version])
else
AC_MSG_RESULT(no)
no_cppunit=yes
fi
fi
if test "x$no_cppunit" = x ; then
ifelse([$2], , :, [$2])
else
CPPUNIT_CFLAGS=""
CPPUNIT_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
])

View File

@@ -1,23 +0,0 @@
dnl Perform a check for a GStreamer element using gst-inspect
dnl Thomas Vander Stichele <thomas at apestaart dot org>
dnl Last modification: 25/01/2005
dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
AC_DEFUN([AM_GST_ELEMENT_CHECK],
[
if test "x$GST_INSPECT" == "x"; then
AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
fi
if test "x$GST_INSPECT" != "x"; then
AC_MSG_CHECKING(GStreamer element $1)
if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
AC_MSG_RESULT(found.)
$2
else
AC_MSG_RESULT(not found.)
$3
fi
fi
])

View File

@@ -1,196 +0,0 @@
# Configure paths for GTK+
# Owen Taylor 1997-2001
dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
dnl pass to pkg-config
dnl
AC_DEFUN([AM_PATH_GTK_2_0],
[dnl
dnl Get the cflags and libraries from pkg-config
dnl
AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
, enable_gtktest=yes)
pkg_config_args=gtk+-2.0
for module in . $4
do
case "$module" in
gthread)
pkg_config_args="$pkg_config_args gthread-2.0"
;;
esac
done
no_gtk=""
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG != xno ; then
if pkg-config --atleast-pkgconfig-version 0.7 ; then
:
else
echo "*** pkg-config too old; version 0.7 or better required."
no_gtk=yes
PKG_CONFIG=no
fi
else
no_gtk=yes
fi
min_gtk_version=ifelse([$1], ,2.0.0,$1)
AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_args; then
echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
enable_gtktest=no
fi
if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
:
else
no_gtk=yes
fi
fi
if test x"$no_gtk" = x ; then
GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
dnl checks the results of pkg-config to some extent)
dnl
rm -f conf.gtktest
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_gtk_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((gtk_major_version != $gtk_config_major_version) ||
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If pkg-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf("*** to point to the correct configuration files\n");
}
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
else
{
if ((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
printf("*** correct copy of pkg-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://pkgconfig.sourceforge.net"
else
if test -f conf.gtktest ; then
:
else
echo "*** Could not run GTK+ test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])

View File

@@ -1,194 +0,0 @@
# Configure paths for GTK+
# Owen Taylor 97-11-3
dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
AC_DEFUN([AM_PATH_GTK],
[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
gtk_config_prefix="$withval", gtk_config_prefix="")
AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
, enable_gtktest=yes)
for module in . $4
do
case "$module" in
gthread)
gtk_config_args="$gtk_config_args gthread"
;;
esac
done
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
fi
fi
if test x$gtk_config_prefix != x ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
if test x${GTK_CONFIG+set} != xset ; then
GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
fi
fi
AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
min_gtk_version=ifelse([$1], ,0.99.7,$1)
AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
no_gtk=""
if test "$GTK_CONFIG" = "no" ; then
no_gtk=yes
else
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS $LIBS"
dnl
dnl Now check if the installed GTK is sufficiently new. (Also sanity
dnl checks the results of gtk-config to some extent
dnl
rm -f conf.gtktest
AC_TRY_RUN([
#include <gtk/gtk.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.gtktest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup("$min_gtk_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_gtk_version");
exit(1);
}
if ((gtk_major_version != $gtk_config_major_version) ||
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
$gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
printf("*** required on your system.\n");
printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
printf("*** before re-running configure\n");
}
#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
(gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
printf("*** library (version %d.%d.%d)\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
}
#endif /* defined (GTK_MAJOR_VERSION) ... */
else
{
if ((gtk_major_version > major) ||
((gtk_major_version == major) && (gtk_minor_version > minor)) ||
((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
gtk_major_version, gtk_minor_version, gtk_micro_version);
printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
printf("***\n");
printf("*** If you have already installed a sufficiently new version, this error\n");
printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
printf("*** being found. The easiest way to fix this is to remove the old version\n");
printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
printf("*** correct copy of gtk-config. (In this case, you will have to\n");
printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
}
],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GTK_CONFIG" = "no" ; then
echo "*** The gtk-config script installed by GTK could not be found"
echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the GTK_CONFIG environment variable to the"
echo "*** full path to gtk-config."
else
if test -f conf.gtktest ; then
:
else
echo "*** Could not run GTK test program, checking why..."
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$LIBS $GTK_LIBS"
AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GTK or finding the wrong"
echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
echo "***"
echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
echo "*** came with the system with the command"
echo "***"
echo "*** rpm --erase --nodeps gtk gtk-devel" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GTK was incorrectly installed"
echo "*** or that you have moved GTK since it was installed. In the latter case, you"
echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
GTK_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
rm -f conf.gtktest
])

View File

@@ -1,57 +0,0 @@
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
AC_DEFUN([PKG_CHECK_MODULES], [
succeeded=no
if test -z "$PKG_CONFIG"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
AC_MSG_CHECKING(for $2)
if $PKG_CONFIG --exists "$2" ; then
AC_MSG_RESULT(yes)
succeeded=yes
AC_MSG_CHECKING($1_CFLAGS)
$1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
AC_MSG_RESULT($$1_CFLAGS)
AC_MSG_CHECKING($1_LIBS)
$1_LIBS=`$PKG_CONFIG --libs "$2"`
AC_MSG_RESULT($$1_LIBS)
else
$1_CFLAGS=""
$1_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
$1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
ifelse([$4], ,echo $$1_PKG_ERRORS,)
fi
AC_SUBST($1_CFLAGS)
AC_SUBST($1_LIBS)
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
ifelse([$3], , :, [$3])
else
ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
fi
])

View File

@@ -1,180 +0,0 @@
# Configure paths for SDL
# Sam Lantinga 9/21/99
# stolen from Manish Singh
# stolen back from Frank Belew
# stolen from Manish Singh
# Shamelessly stolen from Owen Taylor
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
AC_DEFUN([AM_PATH_SDL],
[dnl
dnl Get the cflags and libraries from the sdl-config script
dnl
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
sdl_prefix="$withval", sdl_prefix="")
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
sdl_exec_prefix="$withval", sdl_exec_prefix="")
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program],
, enable_sdltest=yes)
if test x$sdl_exec_prefix != x ; then
sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
fi
fi
if test x$sdl_prefix != x ; then
sdl_args="$sdl_args --prefix=$sdl_prefix"
if test x${SDL_CONFIG+set} != xset ; then
SDL_CONFIG=$sdl_prefix/bin/sdl-config
fi
fi
AC_REQUIRE([AC_CANONICAL_TARGET])
PATH="$prefix/bin:$prefix/usr/bin:$PATH"
AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
min_sdl_version=ifelse([$1], ,0.11.0,$1)
AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
no_sdl=""
if test "$SDL_CONFIG" = "no" ; then
no_sdl=yes
else
SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_sdltest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_CXXFLAGS="$CXXFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
dnl
dnl Now check if the installed SDL is sufficiently new. (Also sanity
dnl checks the results of sdl-config to some extent
dnl
rm -f conf.sdltest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "SDL.h"
char*
my_strdup (char *str)
{
char *new_str;
if (str)
{
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
strcpy (new_str, str);
}
else
new_str = NULL;
return new_str;
}
int main (int argc, char *argv[])
{
int major, minor, micro;
char *tmp_version;
/* This hangs on some systems (?)
system ("touch conf.sdltest");
*/
{ FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_sdl_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_sdl_version");
exit(1);
}
if (($sdl_major_version > major) ||
(($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
(($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
printf("*** to point to the correct copy of sdl-config, and remove the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}
],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_sdl" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$SDL_CONFIG" = "no" ; then
echo "*** The sdl-config script installed by SDL could not be found"
echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
echo "*** your path, or set the SDL_CONFIG environment variable to the"
echo "*** full path to sdl-config."
else
if test -f conf.sdltest ; then
:
else
echo "*** Could not run SDL test program, checking why..."
CFLAGS="$CFLAGS $SDL_CFLAGS"
CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include "SDL.h"
int main(int argc, char *argv[])
{ return 0; }
#undef main
#define main K_and_R_C_main
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding SDL or finding the wrong"
echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means SDL was incorrectly installed"
echo "*** or that you have moved SDL since it was installed. In the latter case, you"
echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
CXXFLAGS="$ac_save_CXXFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
SDL_CFLAGS=""
SDL_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
rm -f conf.sdltest
])

View File

@@ -1,66 +0,0 @@
# Created: 2005/03/12
# Author: David Elliott
# Usage Example:
# make -f build/autogen.mk ACLOCAL=aclocal-1.9
# This is a simple Makefile to update the UNIX build system in such a
# way that doing a cvs diff on its output files should reveal only the
# true changes, not meaningless differences due to slightly different
# autoconf or aclocal m4 files.
# For aclocal: All necessary m4 files are located in the build/aclocal
# directory. Running aclocal -I build/aclocal when using aclocal 1.9
# will result in an aclocal.m4 which uses m4_include for these files.
ACLOCAL=aclocal
AUTOCONF=autoconf
BAKEFILE_GEN=bakefile_gen
AUTOHACKS_PREPEND_INCLUDE_DIR=build/autoconf_prepend-include
# configure depends on everything else so this will build everything.
.PHONY: all
all: configure
.PHONY: autoconf_m4f
# Invoke make on wxAutohacks dir, but don't fail if it's not present
autoconf_m4f:
-make -C $(AUTOHACKS_PREPEND_INCLUDE_DIR)
BAKEFILES=\
build/bakefiles/wx.bkl \
build/bakefiles/common.bkl \
build/bakefiles/files.bkl \
build/bakefiles/monolithic.bkl \
build/bakefiles/multilib.bkl \
build/bakefiles/opengl.bkl \
build/bakefiles/plugins.bkl \
build/bakefiles/build_cfg.bkl
# Run bakefile-gen (which generates everything) whenever a bakefile is newer
# than Makefile.in or autoconf_inc.m4.
# This dep is obviously wrong but probably close enough
autoconf_inc.m4 Makefile.in: $(BAKEFILES)
cd build/bakefiles && \
$(BAKEFILE_GEN) -f autoconf
# Run configure whenever configure.in, aclocal.m4 or autoconf_inc.m4 is updated
# Depend on our custom autoconf.m4f
configure: configure.in aclocal.m4 autoconf_inc.m4 autoconf_m4f
$(AUTOCONF) -B $(AUTOHACKS_PREPEND_INCLUDE_DIR)
ACLOCAL_SOURCES = \
build/aclocal/bakefile.m4 \
build/aclocal/bakefile-lang.m4 \
build/aclocal/cppunit.m4 \
build/aclocal/gst-element-check.m4 \
build/aclocal/gtk-2.0.m4 \
build/aclocal/gtk.m4 \
build/aclocal/pkg.m4 \
build/aclocal/sdl.m4
# Run aclocal whenever acinclude or one of our local m4s is updated.
aclocal.m4: configure.in acinclude.m4 $(ACLOCAL_SOURCES)
$(ACLOCAL) -I build/aclocal

View File

@@ -1,2 +0,0 @@
.bakefile_gen.state
Bakefiles.local.bkgen

View File

@@ -1,264 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<bakefile-gen>
<!--
Formats listed here are not generated by default. To enable them, either
remove them from the <disable-formats> directive below or create
Bakefiles.local.bkgen file in this directory and add <enable-formats>
into it:
<?xml version="1.0" ?>
<bakefile-gen>
<enable-formats>dmars</enable-formats>
</bakefile-gen>
Reasons why these formats are disabled (and so not in CVS):
dmars - In beta testing, will be added when it stabilizes.
dmars_smake - ditto
msevc4prj - ditto
cbuilderx - Generated projects are too bad to be included in CVS. Please
*do not* enable this format until FIXMEs in .bkl files related
to cbuilderx are addressed. In particular, the project must
be placed into build/msw(?) directory and store object files
in its subdirectory and it must copy setup.h as others do.
cbx_unix - Doesn't integrate well and won't be used by most Unix people.
-->
<disable-formats>dmars,dmars_smake,cbx_unix,cbuilderx,msevc4prj</disable-formats>
<!-- These wildcards match all .bkl files in wxWidgets tree: -->
<input>
wx.bkl
../../contrib/build/*/*.bkl
../../samples/*.bkl
../../samples/*/*.bkl
../../samples/*/*/*.bkl
../../demos/*.bkl
../../demos/*/*.bkl
../../demos/*/*/*.bkl
../../utils/*.bkl
../../utils/*/*.bkl
../../utils/*/*/*.bkl
../../contrib/samples/*.bkl
../../contrib/samples/*/*.bkl
../../contrib/samples/*/*/*.bkl
../../contrib/utils/*/*.bkl
../../tests/*.bkl
</input>
<!-- List of output formats to generate: -->
<add-formats>
autoconf,borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
</add-formats>
<del-formats files="../../samples/*.bkl">
autoconf,msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../demos/*.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/html/html_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/mobile/mobile_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../samples/opengl/opengl_samples.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<del-formats files="../../utils/*.bkl">
msvc6prj,msevc4prj,cbuilderx,cbx_unix
</del-formats>
<!-- WinCE can't have console apps: -->
<del-formats files="../../samples/console/*">msevc4prj</del-formats>
<del-formats files="../../utils/HelpGen/src/*">msevc4prj</del-formats>
<del-formats files="../../utils/wxrc/*">msevc4prj</del-formats>
<del-formats files="../../contrib/utils/wxrc/*">msevc4prj</del-formats>
<del-formats files="../../tests/*">msevc4prj</del-formats>
<!-- HtmlCtrl sample is Cocoa only (autoconf format) -->
<del-formats files="../../samples/html/htmlctrl/htmlctrl.bkl">
borland,dmars_smake,dmars,mingw,msvc,msvc6prj,msevc4prj,watcom,cbuilderx,cbx_unix
</del-formats>
<!-- Default flags (for all formats and bakefiles): -->
<add-flags>-Iformats</add-flags>
<!-- Directories where the files go: -->
<add-flags files="wx.bkl" formats="autoconf">
-o../../Makefile.in
</add-flags>
<add-flags files="wx.bkl" formats="borland">
-o../msw/makefile.bcc
</add-flags>
<add-flags files="wx.bkl" formats="dmars_smake">
-o../msw/makefile.dms
</add-flags>
<add-flags files="wx.bkl" formats="dmars">
-o../msw/makefile.dmc
</add-flags>
<add-flags files="wx.bkl" formats="mingw">
-o../msw/makefile.gcc
</add-flags>
<add-flags files="wx.bkl" formats="msvc">
-o../msw/makefile.vc
</add-flags>
<add-flags files="wx.bkl" formats="watcom">
-o../msw/makefile.wat
</add-flags>
<add-flags files="wx.bkl" formats="msvc6prj">
-o../msw/wx.dsw
</add-flags>
<add-flags files="wx.bkl" formats="msevc4prj">
-o../wince/wx.vcw
</add-flags>
<add-flags files="wx.bkl" formats="cbuilderx">
-o../../wx.cbx
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl" formats="autoconf">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/Makefile.in
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl" formats="cbx_unix">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT)Unix.cbx
</add-flags>
<!-- FIXME: don't do this once it is possible (new CBX version) -->
<add-flags files="../../contrib/build/*/*.bkl" formats="cbuilderx">
-o../../contrib/src/$(INPUT_FILE_BASENAME_NOEXT)/$(INPUT_FILE_BASENAME_NOEXT).cbx
</add-flags>
<add-flags files="../../contrib/build/*/*.bkl"
formats="mingw,borland,dmars_smake,dmars,watcom,msvc,msvc6prj,msevc4prj">
-DSRCDIR=../../src/$(INPUT_FILE_BASENAME_NOEXT)
</add-flags>
<!-- Format specific settings: -->
<add-flags formats="autoconf">
-DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4
</add-flags>
<add-formats files="wx.bkl">wx24dsp</add-formats>
<add-flags formats="wx24dsp">
-DUSE_GUI=1 -DWXUNIV=0 -o../../src/wxWindows.dsp
</add-flags>
<add-formats files="wx.bkl">rpmspec</add-formats>
<!-- Makefile specific settings: -->
<add-flags formats="borland,dmars_smake,dmars,mingw,msvc,watcom">
-DWRITE_OPTIONS_FILE=0
</add-flags>
<del-flags files="wx.bkl">
-DWRITE_OPTIONS_FILE=0
</del-flags>
<add-flags files="wx.bkl" formats="borland">
-DOPTIONS_FILE=config.bcc
</add-flags>
<add-flags files="wx.bkl" formats="dmars_smake">
-DOPTIONS_FILE=config.dms
</add-flags>
<add-flags files="wx.bkl" formats="dmars">
-DOPTIONS_FILE=config.dmc
</add-flags>
<add-flags files="wx.bkl" formats="mingw">
-DOPTIONS_FILE=config.gcc
</add-flags>
<add-flags files="wx.bkl" formats="msvc">
-DOPTIONS_FILE=config.vc
</add-flags>
<add-flags files="wx.bkl" formats="watcom">
-DOPTIONS_FILE=config.wat
</add-flags>
<add-flags files="../../*/*">-DWXTOPDIR=../</add-flags>
<add-flags files="../../*/*/*">-DWXTOPDIR=../../</add-flags>
<add-flags files="../../*/*/*/*">-DWXTOPDIR=../../../</add-flags>
<add-flags files="../../*/*/*/*/*">-DWXTOPDIR=../../../../</add-flags>
<add-flags files="../../*/*" formats="borland">
-DOPTIONS_FILE=../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*" formats="dmars_smake">
-DOPTIONS_FILE=../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*" formats="dmars">
-DOPTIONS_FILE=../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*" formats="mingw">
-DOPTIONS_FILE=../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*" formats="msvc">
-DOPTIONS_FILE=../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*" formats="watcom">
-DOPTIONS_FILE=../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*" formats="borland">
-DOPTIONS_FILE=../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*" formats="dmars">
-DOPTIONS_FILE=../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*" formats="mingw">
-DOPTIONS_FILE=../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*" formats="msvc">
-DOPTIONS_FILE=../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*" formats="watcom">
-DOPTIONS_FILE=../../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*/*" formats="borland">
-DOPTIONS_FILE=../../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*/*" formats="dmars">
-DOPTIONS_FILE=../../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*/*" formats="mingw">
-DOPTIONS_FILE=../../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*/*" formats="msvc">
-DOPTIONS_FILE=../../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../build/msw/config.wat
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="borland">
-DOPTIONS_FILE=../../../../build/msw/config.bcc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="dmars_smake">
-DOPTIONS_FILE=../../../../build/msw/config.dms
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="dmars">
-DOPTIONS_FILE=../../../../build/msw/config.dmc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="mingw">
-DOPTIONS_FILE=../../../../build/msw/config.gcc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="msvc">
-DOPTIONS_FILE=../../../../build/msw/config.vc
</add-flags>
<add-flags files="../../*/*/*/*/*" formats="watcom">
-DOPTIONS_FILE=../../../../build/msw/config.wat
</add-flags>
<!-- Personal customizations (not in CVS): -->
<include file="Bakefiles.local.bkgen" ignore_missing="1"/>
</bakefile-gen>

View File

@@ -1,43 +0,0 @@
This directory contains Bakefile (see http://bakefile.sourceforge.net)
files needed to generate native makefiles for wxWidgets library, contrib and
samples.
Use the bakefile_gen utility to regenerate the makefiles (run it in this
directory!). If you run it with no arguments, it will generate all makefiles
that are not up to date.
Use "bakefile_gen -c" to clean generated files.
You can generate or clean only subset of files by specifying -f or -b flags
when invoking bakefile_gen. For example, "bakefile_gen -fborland,watcom" will
only regenerate Borland C++ and OpenWatcom makefiles. -b flag limits
regeneration only to specified bakefiles. For example,
"bakefile_gen -b wx.bkl" will only regenerate main library makefiles.
"bakefile_gen -b "../../samples/html/*/*.bkl" will regenerate makefiles for
all wxHTML samples. -b and -f can be combined.
You can customize the process of generating makefiles by adding file
Bakefiles.local.bkgen (same format as Bakefiles.bkgen) with further settings.
For example, you may disable output for compilers you don't use:
<?xml version="1.0" ?>
<bakefile-gen>
<disable-formats>msvc,msvc6prj</disable-formats>
</bakefile-gen>
Note: bakefile_gen creates file .bakefile_gen.state with dependencies
information. This file can be safely deleted, but it contains valuable
information that speed up regeneration process.
Note: the following files are generated using bakefile_gen:
* build/msw/*
* contrib/build/* (except .bkl files)
* makefiles with same names as makefiles in above dirs, Makefile.in files
that contain "This makefile was generated by Bakefile" banner and
VC++ project files in samples, demos and utils directories (inc. contrib
ones)
* src/wxWindows.dsp
* {wxGTK,wxMotif,wxX11}.spec (only wxBase headers list)
* autoconf_inc.m4
* all Makefile.in files
(hopefully I didn't forget anything - VS)

View File

@@ -1,57 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Generate build.cfg file on Windows, with settings used to build
the library.
-->
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','cbuilderx'] and
TOOLKIT in ['PM','MSW','MGL','MOTIF']">
<set var="BUILD_CFG_FILE" make_var="1">
$(SETUPHDIR)$(DIRSEP)build.cfg
</set>
<action id="build_cfg_file">
<is-phony>1</is-phony>
<dependency-of>all</dependency-of>
<depends>libdir_setup</depends>
<command>
@echo WXVER_MAJOR=$(WXVER_MAJOR) >$(BUILD_CFG_FILE)
@echo WXVER_MINOR=$(WXVER_MINOR) >>$(BUILD_CFG_FILE)
@echo WXVER_RELEASE=$(WXVER_RELEASE) >>$(BUILD_CFG_FILE)
@echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE)
@echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE)
@echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE)
@echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE)
@echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE)
@echo CFG=$(CFG) >>$(BUILD_CFG_FILE)
@echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE)
@echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE)
@echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE)
@echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE)
@echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE)
@echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE)
@echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE)
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_ODBC=$(USE_ODBC) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)
@echo COMPILER=$(COMPILER) >>$(BUILD_CFG_FILE)
@echo CC=$(CC) >>$(BUILD_CFG_FILE)
@echo CXX=$(CXX) >>$(BUILD_CFG_FILE)
@echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE)
@echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE)
@echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE)
@echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE)
</command>
</action>
</if>
</makefile>

View File

@@ -1,762 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<requires version="0.1.7"/>
<!-- bakefile modules we need: -->
<using module="datafiles"/>
<!-- load python module with wxwindows helpers: -->
<using module="wxwin"/>
<!-- DFE: Add a platform meaning regular MacOS (not OS X) -->
<!-- FIXME: This will be handled in Bakefile but for now I wanted to
get my changes to the wx bakefiles in the tree but invisible to
windows toolkits and their config.xxx settings -->
<if cond="FORMAT=='autoconf'">
<option name="PLATFORM_MACOS"/>
</if>
<if cond="FORMAT!='autoconf'">
<set var="PLATFORM_MACOS">0</set>
</if>
<!-- FIXME: PalmOS is another candidate to bakefiles -->
<set var="PLATFORM_PALMOS">0</set>
<include file="config.bkl"/>
<include file="plugins_deps.bkl"/>
<!-- wxWidgets version numbers logic: -->
<include file="version.bkl"/>
<!-- ================================================================== -->
<!-- Names of libraries and DLLs: -->
<!-- ================================================================== -->
<set var="PORTNAME">
<if cond="USE_GUI=='0'">base</if>
<if cond="USE_GUI=='1'">$(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)</if>
</set>
<set var="WXBASEPORT">
<if cond="TOOLKIT=='MAC'">_carbon</if>
</set>
<set var="COMPILERORGCC">
<if cond="isdefined('COMPILER')">$(COMPILER)</if>
<if cond="not isdefined('COMPILER')">gcc</if>
</set>
<set var="WXCOMPILER">
<if cond="PLATFORM_WIN32=='1'">_$(COMPILERORGCC)</if>
</set>
<set var="VENDORTAG">
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'"></if>
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
</set>
<set var="WXDEBUGFLAG">
<if cond="BUILD=='debug' and DEBUG_FLAG=='default'">d</if>
<if cond="DEBUG_FLAG=='1'">d</if>
</set>
<set var="WXUNICODEFLAG">
<!-- WinCE is Unicode-only platform: -->
<if cond="UNICODE=='1' and FORMAT!='msevc4prj'">u</if>
</set>
<set var="WXNAMESUFFIX">
$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
</set>
<set var="WXUNIVNAME">
<if cond="WXUNIV=='1'">univ</if>
</set>
<set var="WXUNIV_DEFINE">
<if cond="WXUNIV=='1'">__WXUNIVERSAL__</if>
</set>
<if cond="FORMAT=='autoconf'">
<set var="WXNAMEPREFIX">wx_base$(WXBASEPORT)</set>
<set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
<set var="WXVERSIONTAG">-$(WX_RELEASE)</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="WXNAMEPREFIX">
wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)
</set>
<set var="WXNAMEPREFIXGUI">
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)</set>
<set var="WXVERSIONTAG"></set>
</if>
<set var="WXDLLNAMEPREFIX">
<if cond="PLATFORM_WIN32=='1'">
wxbase$(WXBASEPORT)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIX)</if>
</set>
<set var="WXDLLNAMEPREFIXGUI">
<if cond="PLATFORM_WIN32=='1'">
wx$(PORTNAME)$(WXUNIVNAME)$(WXWIN32DLLVERSION)
</if>
<if cond="PLATFORM_WIN32=='0'">$(WXNAMEPREFIXGUI)</if>
</set>
<set var="WXDLLVERSIONTAG">
<if cond="PLATFORM_WIN32=='1'"></if>
<if cond="PLATFORM_WIN32=='0'">$(WXVERSIONTAG)</if>
</set>
<!-- =============================================================== -->
<!-- Names of component libraries: -->
<!-- =============================================================== -->
<set var="WXLIB_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<set var="WXLIB_NET">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('net')))</if>
</set>
<set var="WXLIB_QA">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('qa')))</if>
</set>
<set var="WXLIB_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIB_ADV">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('adv')))</if>
</set>
<set var="WXLIB_MEDIA">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('media')))</if>
</set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
</set>
<set var="WXLIB_XML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xml')))</if>
</set>
<set var="WXLIB_XRC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('xrc')))</if>
</set>
<set var="WXLIB_ODBC">
<if cond="MONOLITHIC=='0' and USE_ODBC=='1'">
$(mk.evalExpr(wxwin.mkLibName('odbc')))
</if>
</set>
<set var="WXLIB_DBGRID">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('dbgrid')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
</set>
<!-- =============================================================== -->
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<set var="DIR_SUFFIX_CPU">
<if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
<if cond="TARGET_CPU=='amd64'">_amd64</if>
<if cond="TARGET_CPU=='AMD64'">_amd64</if>
<if cond="TARGET_CPU=='ia64'">_ia64</if>
<if cond="TARGET_CPU=='IA64'">_ia64</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
</set>
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<set var="OBJS" make_var="1">
<if cond="FORMAT!='cbuilderx'">
$(COMPILER)_$(CFG_NAME_PART)$(DIR_SUFFIX_CPU)
</if>
<!-- FIXME: waiting for removal after CBX has better ../ dirs
support -->
<if cond="FORMAT=='cbuilderx'">build_cbx_$(CFG_NAME_PART)</if>
</set>
<set var="BUILDDIR">$(OBJS)</set>
</if>
<set var="LIBTYPE_SUFFIX" make_var="1">
<if cond="FORMAT!='autoconf' and SHARED=='0' and PLATFORM_WIN32=='1'">lib</if>
<if cond="FORMAT!='autoconf' and SHARED=='1' and PLATFORM_WIN32=='1'">dll</if>
<if cond="FORMAT=='watcom' and SHARED=='0' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_lib</if>
<if cond="FORMAT=='watcom' and SHARED=='1' and PLATFORM_WIN32=='0'">$(TOOLKIT_LOWERCASE)_dll</if>
</set>
<set var="LIBDIRNAME" make_var="1">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
<if cond="FORMAT!='autoconf'">
$(nativePaths(TOP_SRCDIR))lib$(DIRSEP)$(COMPILER)$(DIR_SUFFIX_CPU)_$(LIBTYPE_SUFFIX)$(CFG)
</if>
</set>
<if cond="FORMAT!='autoconf'">
<set var="SETUPHDIR" make_var="1">
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
</set>
</if>
<!-- =============================================================== -->
<!-- Templates for libs: -->
<!-- =============================================================== -->
<set var="DEBUGINFO">
<if cond="BUILD=='debug' and DEBUG_INFO=='default'">on</if>
<if cond="DEBUG_INFO=='1'">on</if>
<if cond="BUILD=='release' and DEBUG_INFO=='default'">off</if>
<if cond="DEBUG_INFO=='0'">off</if>
</set>
<set var="DEBUGRUNTIME">
<if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='debug'">on</if>
<if cond="DEBUG_RUNTIME_LIBS=='default' and BUILD=='release'">off</if>
<if cond="DEBUG_RUNTIME_LIBS=='0'">off</if>
<if cond="DEBUG_RUNTIME_LIBS=='1'">on</if>
</set>
<set var="OPTIMIZEFLAG">
<if cond="BUILD=='debug'">off</if>
<if cond="BUILD=='release'">speed</if>
</set>
<set var="EXCEPTIONSFLAG">
<if cond="USE_EXCEPTIONS=='1'">on</if>
<if cond="USE_EXCEPTIONS=='0'">off</if>
</set>
<set var="RTTIFLAG">
<if cond="USE_RTTI=='1'">on</if>
<if cond="USE_RTTI=='0'">off</if>
</set>
<set var="THREADSFLAG">
<if cond="USE_THREADS=='1'">multi</if>
<if cond="USE_THREADS=='0'">single</if>
</set>
<set var="RTTI_DEFINE">
<if cond="USE_RTTI=='0'">wxNO_RTTI</if>
</set>
<set var="EXCEPTIONS_DEFINE">
<if cond="USE_EXCEPTIONS=='0'">wxNO_EXCEPTIONS</if>
</set>
<set var="THREAD_DEFINE">
<if cond="USE_THREADS=='0'">wxNO_THREADS</if>
</set>
<set var="DEBUG_DEFINE">
<if cond="FORMAT!='autoconf' and BUILD=='debug' and DEBUG_FLAG=='default'">__WXDEBUG__</if>
<if cond="FORMAT!='autoconf' and DEBUG_FLAG=='1'">__WXDEBUG__</if>
</set>
<!-- does not cover all cases, but better than nothing -->
<set var="NO_VC_CRTDBG">
<if cond="FORMAT=='msvc' and BUILD=='debug' and DEBUG_RUNTIME_LIBS=='0'">__NO_VC_CRTDBG__</if>
<if cond="FORMAT=='msvc' and BUILD=='release' and DEBUG_FLAG=='1'">__NO_VC_CRTDBG__</if>
</set>
<set var="UNICODE_DEFINE">
<if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if>
</set>
<set var="MSLU_DEFINE">
<if cond="FORMAT!='autoconf' and MSLU=='1'">wxUSE_UNICODE_MSLU=1</if>
</set>
<!-- fill for the specific case of the format/compiler -->
<set var="WIN32_WINNT">
<if cond="FORMAT=='dmars' or FORMAT=='dmars_smake'">_WIN32_WINNT=0x0400</if>
</set>
<set var="UNICOWS_LIB">
<if cond="MSLU=='1'">unicows</if>
</set>
<set var="LINK_TARGET_CPU">
<if cond="TARGET_CPU=='amd64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
<if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
<if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
</set>
<template id="common_settings">
<debug-info>$(DEBUGINFO)</debug-info>
<debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs>
<optimize>$(OPTIMIZEFLAG)</optimize>
<threading>$(THREADSFLAG)</threading>
<runtime-libs>$(RUNTIME_LIBS)</runtime-libs>
<cxx-rtti>$(RTTIFLAG)</cxx-rtti>
<cxx-exceptions>$(EXCEPTIONSFLAG)</cxx-exceptions>
<if cond="FORMAT!='autoconf'">
<cppflags>$(EXTRACFLAGS)</cppflags>
</if>
<define>$(NO_VC_CRTDBG)</define>
<define>$(WIN32_WINNT)</define>
<if cond="FORMAT=='msevc4prj' and
BAKEFILE_VERSION in ['0.1.9'] and
USE_RTTI=='0'">
<!-- hack to make eVC4 2.6.2 project files compatible with what we had in 2.6.1 -->
<set var="_ldlibs">$(_ldlibs.replace('ccrtrtti.lib', ''))</set>
<set var="_cppflags">$(_cppflags.replace('/GR', ''))</set>
</if>
<if cond="FORMAT=='msvc'">
<ldflags>$(LINK_TARGET_CPU)</ldflags>
</if>
</template>
<template id="anylib">
<dirname>$(LIBDIRNAME)</dirname>
<install-to>$(LIBDIR)</install-to>
</template>
<template id="3rdparty_lib" template="common_settings,anylib">
<if cond="FORMAT=='autoconf'">
<libname>$(id)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</libname>
</if>
<if cond="FORMAT!='autoconf'">
<libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
</if>
<!--
we want to install 3rd party libs system-wide only with static
version of wxWidgets; otherwise they are embedded in shared libs:
-->
<install-if>SHARED=='0'</install-if>
<pic>$(substituteFromDict(SHARED, {'0':'off', '1':'on'}))</pic>
</template>
<!-- deal with the need to copy setup.h here: -->
<set var="IS_MSVC_PRJ">$(FORMAT in ['msvc6prj','msevc4prj'])</set>
<define-tag name="msvc-headers" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<!-- FIXME: remove this once we require >=bkl-0.1.9 -->
<if cond="BAKEFILE_VERSION in ['0.1.7', '0.1.8']">
<msvc-project-files>
$(addPrefixToList('include\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
<if cond="BAKEFILE_VERSION not in ['0.1.7', '0.1.8']">
<msvc-project-files>
$(addPrefixToList('include\\', wxwin.headersOnly(value)))
</msvc-project-files>
</if>
</if>
</define-tag>
<set var="msvc_copy_setup_h_script">
<if cond="IS_MSVC_PRJ">
Creating $(SETUPHDIR)\wx\setup.h
InputPath=..\include\wx\%s
"$(SETUPHDIR)\wx\setup.h" : $(DOLLAR)(SOURCE) "$(DOLLAR)(INTDIR)" "$(DOLLAR)(OUTDIR)"
$(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</if>
</set>
<define-tag name="msvc-headers-setup-h" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<msvc-headers>
$(addPrefixToList('wx/', value))
</msvc-headers>
<set var="_custom_build_files" append="1">
$(nativePaths(addPrefixToList('include/wx/', value)))
</set>
</if>
</define-tag>
<define-tag name="msvc-copy-setup-h" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<if cond="FORMAT=='msevc4prj'">
<msvc-headers-setup-h>
msw/wince/setup.h
</msvc-headers-setup-h>
<set var="_custom_build_include_wx_msw_wince_setup_h">
$(msvc_copy_setup_h_script % 'msw\wince\setup.h')
</set>
</if>
<if cond="FORMAT!='msevc4prj'">
<msvc-headers-setup-h>
msw/setup.h
univ/setup.h
</msvc-headers-setup-h>
<set var="_custom_build_include_wx_msw_setup_h">
<if cond="WXUNIV=='0'">
$(msvc_copy_setup_h_script % 'msw\setup.h')
</if>
</set>
<set var="_custom_build_include_wx_univ_setup_h">
<if cond="WXUNIV=='1'">
$(msvc_copy_setup_h_script % 'univ\setup.h')
</if>
</set>
</if>
</if>
</define-tag>
<define-tag name="msvc-create-rcdefs-h" rules="dll,lib">
<if cond="IS_MSVC_PRJ">
<msvc-headers-setup-h>
msw/genrcdefs.h
</msvc-headers-setup-h>
<!-- FIXME: we need another way to get the compiler name -->
<set var="VC_COMPILER">
<if cond="FORMAT=='msevc4prj'">$(_COMPILER)</if>
<if cond="FORMAT!='msevc4prj'">cl</if>
</set>
<set var="_custom_build_include_wx_msw_genrcdefs_h">
Creating $(SETUPHDIR)\wx\msw\rcdefs.h
"$(SETUPHDIR)\wx\msw\rcdefs.h" : "$(DOLLAR)(SOURCE)" "$(DOLLAR)(SETUPHDIR)\wx\msw"
$(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\rcdefs.h"
</set>
</if>
</define-tag>
<template id="msvc_setup_h">
<msvc-copy-setup-h/>
<msvc-create-rcdefs-h/>
</template>
<!-- =============================================================== -->
<!-- 3rd party libs: -->
<!-- =============================================================== -->
<!-- 3rd party libraries: -->
<include file="regex.bkl"/>
<include file="zlib.bkl"/>
<include file="png.bkl"/>
<include file="jpeg.bkl"/>
<include file="tiff.bkl"/>
<include file="odbc.bkl"/>
<include file="expat.bkl"/>
<!-- =============================================================== -->
<!-- Templates for wxWidgets libs: -->
<!-- =============================================================== -->
<!-- NB: in monolithic build, even wxBase-only must be linked against
GUI extralibs, otherwise there would be unresolved references.
The variables below are defined so that all libs are used
in monolithic build, but not in multilib one. -->
<set var="EXTRALIBS_FOR_BASE">
<if cond="MONOLITHIC=='1'">$(EXTRALIBS) $(EXTRALIBS_GUI)</if>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS)</if>
</set>
<set var="EXTRALIBS_FOR_GUI">
<if cond="MONOLITHIC=='1'"></if>
<if cond="MONOLITHIC=='0'">$(EXTRALIBS_GUI)</if>
</set>
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
<set var="MGLLIBPATH">$(DOLLAR)(%SCITECH)/lib/$(BUILD)/dos32/ow10</set>
<set var="MGLPMLIBPATH">
<if cond="DOS32=='DOS4GW'">dos4gw</if>
</set>
</if>
<template id="wx" template="common_settings">
<set var="wxid">$(wxwin.mk_wxid(id))</set>
<define>__WX$(TOOLKIT)__</define>
<define>$(WXUNIV_DEFINE)</define>
<define>$(DEBUG_DEFINE)</define>
<define>$(EXCEPTIONS_DEFINE)</define>
<define>$(RTTI_DEFINE)</define>
<define>$(THREAD_DEFINE)</define>
<define>$(UNICODE_DEFINE)</define>
<define>$(MSLU_DEFINE)</define>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<if cond="TOOLKIT=='MGL' and FORMAT=='watcom'">
<lib-path>$(MGLLIBPATH)</lib-path>
<lib-path>$(MGLLIBPATH)/$(MGLPMLIBPATH)</lib-path>
</if>
<warnings>max</warnings>
<cppflags-watcom>
-wcd=549 <!-- 'sizeof' operand contains compiler generated information -->
-wcd=656 <!-- define this function inside its class definition (may improve code quality) -->
-wcd=657 <!-- define this function inside its class definition (could have improved code quality) -->
-wcd=667 <!-- 'va_start' macro will not work without an argument before '...' -->
</cppflags-watcom>
<cxxflags-mingw>
-Wno-ctor-dtor-privacy <!-- only defines a private destructor and has no friends -->
</cxxflags-mingw>
</template>
<!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base_nomono">
<!-- link against builtin 3rd party libs, if needed: -->
<sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
<sys-lib>$(LIB_PNG)</sys-lib>
<sys-lib>$(LIB_ZLIB)</sys-lib>
<sys-lib>$(LIB_ODBC)</sys-lib>
<sys-lib>$(LIB_REGEX)</sys-lib>
<sys-lib>$(LIB_EXPAT)</sys-lib>
<ldlibs>$(EXTRALIBS_FOR_BASE)</ldlibs>
<!-- system libraries on os2: -->
<if cond="FORMAT!='autoconf' and PLATFORM_OS2=='1'">
<if cond="FORMAT=='watcom'">
<sys-lib>upm32</sys-lib>
</if>
</if>
<!-- system libraries on mgl: -->
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
<sys-lib>mgl</sys-lib>
<sys-lib>mglcpp</sys-lib>
<sys-lib>pm</sys-lib>
</if>
<!-- system libraries on windows: -->
<if cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
<sys-lib>$(UNICOWS_LIB)</sys-lib>
<if cond="FORMAT=='borland'">
<sys-lib>ole2w32</sys-lib>
</if>
<if cond="FORMAT=='msevc4prj'">
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>commctrl</sys-lib>
<sys-lib>winsock</sys-lib>
<sys-lib>wininet</sys-lib>
</if>
<if cond="FORMAT!='borland' and FORMAT!='msevc4prj'">
<sys-lib>kernel32</sys-lib>
<sys-lib>user32</sys-lib>
<sys-lib>gdi32</sys-lib>
<sys-lib>comdlg32</sys-lib>
<sys-lib>winspool</sys-lib>
<sys-lib>winmm</sys-lib>
<sys-lib>shell32</sys-lib>
<sys-lib>comctl32</sys-lib>
<sys-lib>ole32</sys-lib>
<sys-lib>oleaut32</sys-lib>
<sys-lib>uuid</sys-lib>
<sys-lib>rpcrt4</sys-lib>
<sys-lib>advapi32</sys-lib>
<sys-lib>wsock32</sys-lib>
</if>
<if cond="FORMAT=='borland'">
<sys-lib>oleacc</sys-lib>
</if>
<if cond="FORMAT!='msevc4prj'">
<sys-lib>odbc32</sys-lib>
</if>
</if>
</template>
<!-- for GUI libs/samples: -->
<template id="wx_append_nomono" template="wx_append_base_nomono">
<ldlibs>$(EXTRALIBS_FOR_GUI)</ldlibs>
</template>
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<set var="WX_DISABLE_PRECOMP_HEADERS" overwrite="0">0</set>
<template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','WINCE']">
<sources>$(WXTOPDIR)src/msw/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/msw/dummy.cpp
</precomp-headers-gen>
</if>
<precomp-headers-location>$(WXTOPDIR)include</precomp-headers-location>
<precomp-headers-header>wx/wxprec.h</precomp-headers-header>
<precomp-headers>on</precomp-headers>
<precomp-headers-file>wxprec_$(id)</precomp-headers-file>
<precomp-headers-exclude>
src/common/extended.c
</precomp-headers-exclude>
</if>
<if cond="IS_MSVC_PRJ=='1' and BUILDING_LIB=='1'">
<msvc-file-group>Common Sources:src/common/*</msvc-file-group>
<msvc-file-group>MSW Sources:src/msw/*</msvc-file-group>
<msvc-file-group>Generic Sources:src/generic/*</msvc-file-group>
<msvc-file-group>wxUniv Sources:src/univ/*</msvc-file-group>
<msvc-file-group>wxHTML Sources:src/html/*</msvc-file-group>
<msvc-file-group>Setup Headers:*/setup.h</msvc-file-group>
<msvc-file-group>MSW Headers:*wx/msw/*.h</msvc-file-group>
<msvc-file-group>Generic Headers:*wx/generic/*.h</msvc-file-group>
<msvc-file-group>wxUniv Headers:*wx/univ/*.h</msvc-file-group>
<msvc-file-group>wxHTML Headers:*wx/html/*.h</msvc-file-group>
<msvc-file-group>Common Headers:*wx/*.h</msvc-file-group>
</if>
</template>
<if cond="FORMAT=='autoconf'">
<set var="RCDEFDIR">
<if cond="TOOLKIT=='MSW'">
$(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
</if>
</set>
</if>
<template id="wx_dll_b" template="wx_lib_b">
<set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
<dllname>$(WXDLLNAME)</dllname>
<version>$(WX_VERSION)</version>
<so_version>$(WXSOVERSION)</so_version>
<!-- FIXME: until libtool scheme is implemented in bakefile -->
<ldflags cond="FORMAT=='autoconf'">$(WXMACVERSION_CMD)</ldflags>
<!-- version info resources: -->
<if cond="FORMAT not in ['rpmspec','wx24dsp']"> <!-- FIXME: fix for bkl-0.1.7 only, remove the cond later -->
<res-define>WXDLLNAME=$(WXDLLNAME)</res-define>
<if cond="FORMAT=='autoconf'">
<res-include>$(RCDEFDIR)</res-include>
<res-include>$(TOP_SRCDIR)include</res-include>
</if>
</if>
<win32-res>$(WXTOPDIR)src/msw/version.rc</win32-res>
</template>
<template id="wx_3rdparty_dependencies_gui" cond="USE_GUI=='1'">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
</template>
<template id="wx_3rdparty_dependencies"
template="wx_3rdparty_dependencies_gui">
<depends>wxexpat</depends>
<depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
<template id="wx_3rdparty_includes_gui" cond="USE_GUI=='1'">
<if cond="FORMAT=='watcom' and TOOLKIT=='MGL'">
<include>$(DOLLAR)(%SCITECH)/include</include>
</if>
<include>$(INC_TIFF)</include>
<include>$(INC_JPEG)</include>
<include>$(INC_PNG)</include>
</template>
<template id="wx_3rdparty_includes"
template="wx_3rdparty_includes_gui">
<include>$(INC_ZLIB)</include>
<include>$(INC_ODBC)</include>
<include>$(INC_REGEX)</include>
<include>$(INC_EXPAT)</include>
</template>
<template id="wx_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h"/>
<template id="wx_base_lib"
template="wx_lib_b,wx_3rdparty_includes,msvc_setup_h">
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_nomono"/>
<template id="wx_base_dll"
template="wx_dll_b,wx_3rdparty_dependencies,wx_3rdparty_includes"
template_append="msvc_setup_h,wx_append_base_nomono">
<define>wxUSE_GUI=0</define>
</template>
<!-- =============================================================== -->
<!-- Templates for building wxWidgets plugins: -->
<!-- =============================================================== -->
<if cond="WX_STABLE_BRANCH=='1'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">$(WX_RELEASE)</if>
<if cond="PLATFORM_UNIX=='0'">$(WX_RELEASE_NODOT)</if>
</set>
</if>
<if cond="WX_STABLE_BRANCH=='0'">
<set var="PLUGIN_VERSION0">
<if cond="PLATFORM_UNIX=='1'">$(WX_VERSION)</if>
<if cond="PLATFORM_UNIX=='0'">$(WX_VERSION_NODOT)</if>
</set>
</if>
<set var="PLUGVERDELIM">
<if cond="PLATFORM_UNIX=='1'">-</if>
<if cond="PLATFORM_UNIX=='0'"></if>
</set>
<set var="PLUGIN_VERSION">$(PLUGVERDELIM)$(PLUGIN_VERSION0)</set>
<set var="PLUGINSUFFIX">
<if cond="UNICODE=='0' and BUILD=='release'"></if>
<if cond="UNICODE=='0' and BUILD=='debug'">d</if>
<if cond="UNICODE=='1' and BUILD=='release'">u</if>
<if cond="UNICODE=='1' and BUILD=='debug'">ud</if>
</set>
<set var="PLUGINS_INST_DIR" make_var="1">
$(LIBDIR)/wx/$(PLUGIN_VERSION0)
</set>
<define-rule name="wx-base-plugin" extends="module">
<template>
<dllname>
$(id)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<define>wxUSE_GUI=0</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<define-rule name="wx-gui-plugin" extends="module">
<template template="wx">
<dllname>
$(id)_$(PORTNAME)$(WXUNIVNAME)$(PLUGINSUFFIX)$(PLUGIN_VERSION)$(WXCOMPILER)
</dllname>
<define>WXUSINGDLL</define>
<install-to>$(PLUGINS_INST_DIR)</install-to>
</template>
</define-rule>
<!-- =============================================================== -->
<!-- Support for wxWidgets samples and contrib: -->
<!-- =============================================================== -->
<!-- Link against one wxWin library. Value must be literal! -->
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
<depends-on-dsp>$(wxwin.makeDspDependency(value))</depends-on-dsp>
</if>
</define-tag>
<!-- A hack to keep autoconf happy (we pass CPPFLAGS that contain
{top_srcdir} from configure, poor bakefile can't know that
and won't output top_srcdir = @top_srcdir@ line): -->
<set var="VARS_DONT_ELIMINATE" append="1">top_srcdir</set>
</makefile>

View File

@@ -1,50 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="not isdefined('file_common_samples_included')">
<include file="common.bkl"/>
</if>
<set var="CONTRIB_HDR_DIR" overwrite="0">$(SRCDIR)/../../include</set>
<!-- =============================================================== -->
<!-- Contrib lib helpers: -->
<!-- =============================================================== -->
<template id="wx_contrib_lib" template="wx_lib_b">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<if cond="isdefined('file_common_samples_included')">
<template id="wx_contrib_sample" template="wx_sample">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_util" template="wx_util">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
</if>
<template id="wx_contrib_dll"
template="wx_dll_b" template_append="wx_append">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
<install-to>$(INCLUDEDIR)/wx-$(WX_RELEASE)$(WX_FLAVOUR)</install-to>
</template>
<!-- Link against one contrib library. Value must be literal! -->
<define-tag name="contrib-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<ldlibs>$(wxwin.extraLdflags(value))</ldlibs>
<if cond="IS_MSVC_PRJ=='1' and MONOLITHIC=='0'">
<depends-on-dsp>
$(wxwin.makeContribDspDependency(value))
</depends-on-dsp>
</if>
</define-tag>
</makefile>

View File

@@ -1,123 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="common.bkl"/>
<set var="file_common_samples_included">1</set>
<!-- =============================================================== -->
<!-- Template for wxWidgets samples: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<set var="MACOSX_RESOURCES">
<if cond="TOOLKIT=='MAC'">
Carbon.r sample.r
</if>
</set>
</if>
<set var="DLLFLAG">
<if cond="SHARED=='1'">WXUSINGDLL</if>
</set>
<template id="wx_util_b" template="wx">
<include>$(SRCDIR)</include>
<define>$(DLLFLAG)</define>
</template>
<template id="wx_util" template="wx_util_b">
<app-type>gui</app-type>
<mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
<!-- resource files includes: -->
<include>$(SRCDIR)/$(WXTOPDIR)samples</include>
<!-- this include is not added via <include> for autoconf, see
common.bkl: -->
<if cond="FORMAT=='autoconf'">
<res-include>$(RCDEFDIR)</res-include>
<res-include>$(TOP_SRCDIR)include</res-include>
</if>
<win32-res>$(WXTOPDIR)samples/sample.rc</win32-res>
<if cond="FORMAT=='autoconf'">
<wx-os2-lib-resource/>
</if>
<!-- FIXME: temporary, until bakefile can reuse existing pch files -->
<if cond="FORMAT!='autoconf'">
<define>NOPCH</define>
</if>
</template>
<template id="wx_util_console" template="wx_util_b">
<app-type>console</app-type>
<define>wxUSE_GUI=0</define>
</template>
<template id="wx_sample" template="wx_util">
<if cond="FORMAT=='autoconf'">
<wx-mac-app-bundle/>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
</if>
</template>
<template id="wx_sample_console" template="wx_util_console">
<if cond="FORMAT=='autoconf'">
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<postlink-command>$(SAMPLES_RPATH_POSTLINK)</postlink-command>
</if>
</template>
<!-- =============================================================== -->
<!-- Support for samples data files: -->
<!-- =============================================================== -->
<define-rule name="wx-data" extends="copy-files">
<template>
<dependency-of>all</dependency-of>
<dstdir>$(BUILDDIR)</dstdir>
<srcdir>$(SRCDIR)</srcdir>
</template>
<!--
VS - FIXME:
Don't clean the files because it would wipe out sources files if
BUILDDIR==SRCDIR. This is same behaviour as in the old build system,
but it would be better to delete the files during "make clean" if
BUILDDIR!=SRCDIR.
<define-tag name="files">
<clean-files>
$(' '.join(['$(BUILDDIR)$(DIRSEP)%s'%x for x in value.split()]))
</clean-files>
</define-tag>
-->
</define-rule>
<!-- =============================================================== -->
<!-- Misc platform specialities: -->
<!-- =============================================================== -->
<if cond="FORMAT=='autoconf'">
<include file="mac_bundles.bkl"/>
<!--
A hack to include precompiled OS/2 resource file in apps instead of
compiling it from .rc file (gcc on OS/2 doesn't ship with resource
compiler):
-->
<define-tag name="wx-os2-lib-resource" rules="exe">
<set var="os2_lib_res">
<if cond="PLATFORM_OS2=='1'">
$(TOP_SRCDIR)include/wx/os2/wx.res
</if>
</set>
<set var="__objects" append="1">$(os2_lib_res)</set>
</define-tag>
</if>
</makefile>

View File

@@ -1,461 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="BUILDING_LIB" overwrite="0">0</set>
<set var="CPP_DEFAULT_VALUE">
<if cond="FORMAT=='borland'">
cpp32 -Sr -oCON
</if>
<if cond="FORMAT=='mingw'">
$(DOLLAR)(CC) -E
</if>
<if cond="FORMAT=='msvc'">
$(DOLLAR)(CC) /EP /nologo
</if>
<if cond="FORMAT=='watcom'">
$(DOLLAR)(CC) -p
</if>
</set>
<option name="CPP">
<default-value>
$(CPP_DEFAULT_VALUE)
</default-value>
<description>
The C preprocessor
</description>
</option>
<option name="SHARED">
<values>0,1</values>
<values-description>,DLL</values-description>
<default-value>0</default-value>
<description>
What type of library to build?
</description>
</option>
<option name="WXUNIV">
<values>0,1</values>
<values-description>,Universal</values-description>
<default-value>0</default-value>
<description>
Build wxUniversal instead of native port?
</description>
</option>
<option name="UNICODE">
<values>0,1</values>
<values-description>,Unicode</values-description>
<default-value>0</default-value>
<description>
Compile Unicode build of wxWidgets?
</description>
</option>
<if cond="FORMAT!='autoconf' and FORMAT!='watcom'">
<option name="MSLU">
<values>0,1</values>
<default-value>0</default-value>
<description>
Use MSLU library when building Unicode version.
</description>
</option>
</if>
<if cond="FORMAT=='autoconf' or FORMAT=='watcom'">
<set var="MSLU">0</set>
</if>
<option name="BUILD">
<values>debug,release</values>
<values-description>Debug,Release</values-description>
<default-value>debug</default-value>
<description>
Type of compiled binaries
</description>
</option>
<if cond="FORMAT=='msvc'">
<option name="TARGET_CPU">
<values>AMD64,IA64</values>
<default-value>$(DOLLAR)(CPU)</default-value>
<description>
The target processor architecture must be specified when it is not X86.
This does not affect the compiler output, so you still need to make sure
your environment is set up appropriately with the correct compiler in the
PATH. Rather it affects some options passed to some of the common build
utilities such as the resource compiler and the linker.
</description>
</option>
</if>
<if cond="FORMAT!='msvc'">
<set var="TARGET_CPU"/>
</if>
<!-- FIXME: restore this once bakefile is fixed to not use
/Gm /GZ (incompatible with /O2) w/ debug-info -->
<set var="DEBUG_INFO_DEFAULT">
<if cond="FORMAT in ['msvc','msvc6prj','msevc4prj']">1</if>
<if cond="FORMAT not in ['msvc','msvc6prj','msevc4prj']">default</if>
</set>
-->
<set var="DEBUG_INFO_DEFAULT">default</set>
<option name="DEBUG_INFO">
<values>0,1,default</values>
<default-value>$(DEBUG_INFO_DEFAULT)</default-value>
<description>
Should debugging info be included in the executables? The default value
"default" means that debug info will be included if BUILD=debug
and not included if BUILD=release.
</description>
</option>
<option name="DEBUG_FLAG">
<values>0,1,default</values>
<default-value>default</default-value>
<description>
Should __WXDEBUG__ be defined? The default value "default" means that it will
be defined if BUILD=debug and not defined if BUILD=release.
</description>
</option>
<if cond="FORMAT=='msvc'">
<option name="DEBUG_RUNTIME_LIBS">
<values>0,1,default</values>
<default-value>default</default-value>
<description>
Should link against debug RTL (msvcrtd.dll) or release (msvcrt.dll)?
Acts according to BUILD by default.
</description>
</option>
</if>
<if cond="FORMAT!='msvc'">
<set var="DEBUG_RUNTIME_LIBS">default</set>
</if>
<set var="MONOLITHIC_DEFAULT">
<if cond="FORMAT=='watcom'">1</if>
<if cond="FORMAT!='watcom'">0</if>
</set>
<option name="MONOLITHIC">
<values>0,1</values>
<values-description>Multilib,Monolithic</values-description>
<default-value>$(MONOLITHIC_DEFAULT)</default-value>
<description>
Multiple libraries or single huge monolithic one?
</description>
</option>
<if cond="FORMAT=='autoconf'"> <!-- FIXME - temporary -->
<option name="USE_PLUGINS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build parts of the library as dynamically loadable plugins
(only supported in multilib build)?
</description>
</option>
</if>
<if cond="FORMAT!='autoconf'">
<set var="USE_PLUGINS">0</set> <!-- FIXME - temporary -->
</if>
<option name="USE_GUI">
<values>0,1</values>
<values-description>Base,GUI</values-description>
<default-value>1</default-value>
<description>
Build GUI libraries?
</description>
</option>
<option name="USE_HTML">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxHTML library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_XRC">
<values>0,1</values>
<default-value>1</default-value>
<description>
Build wxXRC library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_OPENGL">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build OpenGL canvas library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_ODBC">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build ODBC database classes (USE_GUI must be 1)?
</description>
</option>
<option name="USE_QA">
<values>0,1</values>
<default-value>0</default-value>
<description>
Build quality assurance classes library (USE_GUI must be 1)?
</description>
</option>
<option name="USE_EXCEPTIONS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Enable exceptions in compiled code.
</description>
</option>
<option name="USE_RTTI">
<values>0,1</values>
<default-value>1</default-value>
<description>
Enable run-time type information (RTTI) in compiled code.
</description>
</option>
<option name="USE_THREADS">
<values>0,1</values>
<default-value>1</default-value>
<description>
Enable threading in compiled code.
</description>
</option>
<option name="OFFICIAL_BUILD">
<values>0,1</values>
<default-value>0</default-value>
<description>
Is this official build by wxWidgets developers?
</description>
</option>
<option name="VENDOR">
<default-value>custom</default-value>
<description>
Use this to name your customized DLLs differently
</description>
</option>
<!-- These basically do what vendor does in the places it didn't. -->
<!-- They should all be unified under some suitable descriptor -->
<option name="WX_FLAVOUR">
<default-value></default-value>
</option>
<option name="WX_LIB_FLAVOUR">
<default-value></default-value>
</option>
<option name="CFG">
<default-value></default-value>
<description>
Name of your custom configuration. This affects directory
where object files are stored as well as the location of
compiled .lib files and setup.h under the lib/ toplevel directory.
</description>
</option>
<!-- unit tests support: -->
<option name="CPPUNIT_CFLAGS">
<default-value></default-value>
<description>
Compiler flags needed to compile test suite in tests directory. If you want
to run the tests, set it so that the compiler can find CppUnit headers.
</description>
</option>
<option name="CPPUNIT_LIBS">
<default-value></default-value>
<description>
Linker flags needed to link test suite in tests directory. If you want
to run the tests, include CppUnit library here.
</description>
</option>
<!-- ================================================================== -->
<!-- Autoconf -->
<!-- ================================================================== -->
<if cond="FORMAT=='autoconf'">
<option name="REZ"/>
<option name="DEREZ"/>
<option name="TOOLKIT"/>
<option name="TOOLKIT_LOWERCASE"/>
<option name="TOOLKIT_VERSION"/>
<option name="TOOLCHAIN_NAME"/>
<option name="TOOLCHAIN_FULLNAME"/>
<option name="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_HTML"/>
<option name="EXTRALIBS_ODBC"/>
<option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/>
<option name="EXTRALIBS_SDL"/>
<option name="EXTRALIBS_GNOMEPRINT"/>
<option name="HOST_SUFFIX"/>
<option name="SAMPLES_RPATH_FLAG"/>
<option name="SAMPLES_RPATH_POSTLINK"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<option name="WITH_PLUGIN_SDL">
<values>0,1</values>
</option>
</if>
<!-- ================================================================== -->
<!-- windows/dos/os2 compilers -->
<!-- ================================================================== -->
<if cond="FORMAT!='autoconf'">
<option name="RUNTIME_LIBS">
<values>dynamic,static</values>
<default-value>dynamic</default-value>
<description>
Version of C runtime library to use. You can change this to
static if SHARED=0, but it is highly recommended to not do
it if SHARED=1 unless you know what you are doing.
</description>
</option>
<set var="WXTOPDIR"/> <!-- to be overriden on bakefile cmd line -->
<set var="TOOLKIT" overwrite="0">
<if cond="FORMAT=='msevc4prj'">WINCE</if>
<if cond="FORMAT!='msevc4prj' and PLATFORM_WIN32=='1'">MSW</if>
<if cond="PLATFORM_MSDOS=='1'">MGL</if>
<if cond="PLATFORM_OS2=='1'">PM</if>
</set>
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/>
<set var="HOST_SUFFIX"/>
<set var="EXTRACFLAGS"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_ODBC"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL">
<if cond="COMPILER=='wat' and TOOLKIT=='MSW'">opengl32.lib glu32.lib</if>
<if cond="COMPILER in ['vc','evc']">opengl32.lib glu32.lib</if>
<if cond="COMPILER=='gcc'">-lopengl32 -lglu32</if>
</set>
<set var="EXTRALIBS_SDL"/>
<set var="EXTRALIBS_GNOMEPRINT"/>
<set var="WITH_PLUGIN_SDL">0</set>
<set var="SRCDIR">
<if cond="BUILDING_LIB=='1'">..$(DIRSEP)..</if>
<if cond="BUILDING_LIB=='0'">.</if>
</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
</if>
<if cond="FORMAT=='mingw'">
<option name="GCC_VERSION">
<values>3,2.95</values>
<default-value>3</default-value>
<description>
Set the version of your Mingw installation here.
"3" ...... this is for Mingw 2.0 or newer (comes with gcc3)
"2.95" ... for Mingw 1.1 or any of the older versions
</description>
</option>
<set var="GCCFLAGS">
<if cond="GCC_VERSION=='2.95'">-fvtable-thunks</if>
</set>
<set var="EXTRACFLAGS">$(GCCFLAGS) -DHAVE_W32API_H</set>
</if>
<if cond="FORMAT=='cbuilderx'">
<set var="EXTRACFLAGS">
<if cond="COMPILER=='gcc'">-DHAVE_W32API_H</if>
</set>
</if>
<!-- ================================================================== -->
<!-- Project files - hardcode some defaults -->
<!-- ================================================================== -->
<if cond="FORMAT_SUPPORTS_CONDITIONS=='0'">
<set var="RUNTIME_LIBS">dynamic</set>
<set var="OFFICIAL_BUILD">0</set>
<set var="USE_HTML">1</set>
<set var="USE_XRC">1</set>
<set var="USE_OPENGL">1</set>
<set var="USE_ODBC">1</set>
<set var="USE_QA">1</set>
<set var="MONOLITHIC">0</set>
<set var="USE_GUI">1</set>
<set var="USE_EXCEPTIONS">1</set>
<set var="USE_RTTI">1</set>
<set var="USE_THREADS">1</set>
<set var="DEBUG_INFO">$(DEBUG_INFO_DEFAULT)</set>
<set var="DEBUG_FLAG">default</set>
<set var="MSLU">0</set>
</if>
<!-- FIXME:
C++BuilderX supports only wxMSW, monolithic (sic!) static build
and the project can't be put into build/msw and store objects in
build/msw/something. This *must* be fixed! -->
<if cond="FORMAT=='cbuilderx'">
<set var="WXUNIV">0</set>
<set var="MONOLITHIC">1</set>
<set var="SRCDIR">.</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
<set var="SHARED">0</set>
</if>
<!-- DigitalMars make is braindead, it doesn't have conditional
processing: -->
<if cond="FORMAT=='dmars'">
<set var="RUNTIME_LIBS">static</set>
<set var="BUILD">debug</set>
<set var="SHARED">0</set>
<set var="WXUNIV">0</set>
<set var="UNICODE">0</set>
<!-- Free version does not distribute OpenGL,
in commercial distribution better use dmars_smake format -->
<set var="USE_OPENGL">0</set>
</if>
<!-- No need for wxUniv on embedded devices (yet): -->
<if cond="FORMAT=='msevc4prj'">
<set var="WXUNIV">0</set>
<set var="UNICODE">1</set>
<!-- Uploading debug reports from PDAs seems impractical -->
<set var="USE_QA">0</set>
<set var="MONOLITHIC">1</set> <!-- sic! -->
<!-- RTTI and exceptions need separate cccrtti.lib with eVC4 -->
<set var="USE_RTTI">0</set>
<set var="USE_EXCEPTIONS">0</set>
</if>
<!-- Need for wxUniv within wxMGL: -->
<if cond="FORMAT!='autoconf' and TOOLKIT=='MGL'">
<set var="WXUNIV">1</set>
<set var="USE_THREADS">0</set>
</if>
</makefile>

View File

@@ -1,48 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_EXPAT"/>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">
wxexpat$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_EXPAT">builtin</set>
<set var="LIB_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">
wxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="INC_EXPAT">
<if cond="wxUSE_EXPAT=='builtin'">$(TOP_SRCDIR)src/expat/lib</if>
</set>
<lib id="wxexpat" template="3rdparty_lib"
cond="wxUSE_EXPAT=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
<include cond="FORMAT=='autoconf'">$(BUILDDIR)/src/expat</include>
<define cond="FORMAT!='autoconf' and PLATFORM_WIN32=='1'">
COMPILED_FROM_DSP
</define>
<define cond="FORMAT=='watcom' and PLATFORM_OS2=='1'">
OS2_32
</define>
<define cond="FORMAT=='watcom' and PLATFORM_MSDOS=='1'">
__MSDOS__
</define>
<cflags-borland>-w-8004 -w-8008 -w-8012 -w-8057 -w-8066</cflags-borland>
<sources>
src/expat/lib/xmlparse.c
src/expat/lib/xmlrole.c
src/expat/lib/xmltok.c
</sources>
</lib>
</makefile>

File diff suppressed because it is too large Load Diff

View File

@@ -1,28 +0,0 @@
<?xml version="1.0" ?>
<bakefile-manifest>
<format id="wx24dsp">
<description>
src/wxWindows.dsp which makes same files as 2.4 version
</description>
<default-filename>wxWindows.dsp</default-filename>
</format>
<format id="rpmspec">
<description>
wxBase headers list in wx{GTK,Motif,X11}.spec
</description>
<default-filename>xxx.spec</default-filename>
</format>
<format id="cbx_unix">
<description>
C++BuilderX projects for Unix (use configure)
</description>
<default-filename>
$(os.path.splitext(os.path.basename(INPUT_FILE))[0])Unix.cbx
</default-filename>
</format>
</bakefile-manifest>

View File

@@ -1,6 +0,0 @@
This directory contains misc Bakefile backends that are wxWidgets-specific:
wx24dsp - generates wx2.4-compatible VC++ project file (src/wxWindows.dsp)
rpmspec - generates part of .spec files with list of wxBase headers
cbx_unix - Borland C++BuilderX project files for configure-based build

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="presets/fake.bkl"/>
<set var="COMPILER">vc</set>
<define-tag name="__fake_hook" rules="__fake">
<set var="type" overwrite="0">fake</set>
</define-tag>
<define-tag name="__fake_hook" rules="exe">
<set var="type">exe</set>
</define-tag>
<output file="$(OUTPUT_FILE)" writer="cbx_unix.empy"/>
<set var="FORMAT_OUTPUT_VARIABLES">type</set>
</makefile>

View File

@@ -1,77 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--C++BuilderX Project-->
<project>
<property category="build.config" name="active" value="0"/>
<property category="build.config" name="count" value="1"/>
<property category="build.config" name="excludedefaultforzero" value="0"/>
<property category="build.config.0" name="builddir" value="Debug"/>
<property category="build.config.0" name="key" value="Debug_Build"/>
<property category="build.config.0" name="name" value="Debug Build"/>
<property category="build.config.0" name="settings.MinGW" value="default;debug"/>
<property category="build.config.0" name="settings.gnuc++" value="default;debug"/>
<property category="build.config.0" name="settings.intellinia32" value="default;debug"/>
<property category="build.config.0" name="settings.mswin32" value="default;debug"/>
<property category="build.config.0" name="type" value="Toolset"/>
<property category="build.config.1" name="key" value="Release_Build"/>
<property category="build.config.1" name="name" value="Release Build"/>
<property category="build.config.1" name="settings.MinGW" value="default;release"/>
<property category="build.config.1" name="settings.gnuc++" value="default;release"/>
<property category="build.config.1" name="settings.intellinia32" value="default;release"/>
<property category="build.config.1" name="settings.mswin32" value="default;release"/>
<property category="build.config.1" name="type" value="Toolset"/>
<property category="build.node" name="type" value="CBMakefileProjectType"/>
<property category="build.platform" name="active" value="linux"/>
<property category="build.platform" name="linux.Debug_Build.toolset" value="gnuc++"/>
<property category="build.platform" name="linux.Release_Build.toolset" value="gnuc++"/>
<property category="build.platform" name="linux.default" value="gnuc++"/>
<property category="build.platform" name="linux.gnuc++.enabled" value="1"/>
<property category="build.platform" name="linux.mswin32.enabled" value="0"/>
<property category="build.platform" name="linux.win32b.enabled" value="0"/>
<property category="build.platform" name="solaris.default" value="gnuc++"/>
<property category="build.platform" name="solaris.enabled" value="0"/>
<property category="build.platform" name="win32.default" value="MinGW"/>
<property category="build.platform" name="win32.enabled" value="0"/>
<property category="cbproject" name="lastnodeid" value="4"/>
<property category="cbproject" name="version" value="X.1.0"/>
<property category="classbrowser" name="enable" value="0"/>
<property category="classbrowser" name="parser.cpp.skip_standard_directories" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.1" value="/usr/include"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.arg.2" value="/usr/include/g++-3"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.I.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.MD.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.O0.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.c.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.arg" value="2"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.g.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++compile" name="option.o.enabled" value="1"/>
<property category="linux.Debug_Build.gnuc++.g++link" name="option.o.enabled" value="1"/>
<property category="linux.gnuc++.Debug_Build" name="saved" value="1"/>
<property category="makefileproject" name="makefile.ID.1" value="1"/>
<property category="makefileproject" name="makefile.list.1" value="Makefile"/>
<property category="makefiletarget" name="makefile.1.params" value="-f Makefile"/>
<property category="makefiletarget" name="makefile.1.target.list.1" value="all"/>
<property category="makefiletarget" name="makefile.1.target.list.2" value="clean"/>
<property category="runtime" name="ConfigurationCount" value="@(len([t for t in targets if t.type=='exe'])-1)"/>
@{
ALL_EXES = [x for x in targets if x.type=='exe']
if len(ALL_EXES) == 1:
DEFAULT_EXE = 0
else:
DEFAULT_EXE = -1
}@
<property category="runtime" name="DefaultConfiguration" value="@DEFAULT_EXE"/>
@[for i in range(0,len(ALL_EXES))]@
<property category="runtime.@i" name="BuildTargetOnRun" value="com.borland.cbuilder.build.CBProjectBuilder$ProjectBuildAction;make"/>
<property category="runtime.@i" name="ConfigurationName" value="@ALL_EXES[i].id"/>
<property category="runtime.@i" name="RunnableType" value="com.borland.cbuilder.runtime.ExecutableRunner"/>
<property category="runtime.@i" name="native.exec.path" value="./@ALL_EXES[i].id"/>
<property category="runtime.@i" name="native.startdir.path" value="."/>
<property category="runtime.@i" name="native.target.override" value="1"/>
@[end for]@
<property category="unique" name="id" value="4"/>
<node name="console" type="NavigationDirectory">
<property category="directorynode" name="showSubdirectories" value="1"/>
<property category="directorynode" name="url" value="."/>
<property category="unique" name="id" value="1"/>
</node>
</project>

View File

@@ -1,22 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="presets/fake.bkl"/>
<set var="COMPILER">gcc</set>
<!-- fake.bkl defaults to win32 platform -->
<set var="PLATFORM_UNIX">1</set>
<set var="PLATFORM_WIN32">0</set>
<set var="FORMAT_OUTPUT_VARIABLES">ALL_BASE_HEADERS</set>
<output file="../../wxGTK.spec"
writer="rpmspec.empy" method="insertBetweenMarkers"/>
<output file="../../wxX11.spec"
writer="rpmspec.empy" method="insertBetweenMarkers"/>
<output file="../../wxMotif.spec"
writer="rpmspec.empy" method="insertBetweenMarkers"/>
</makefile>

View File

@@ -1,5 +0,0 @@
# --- wxBase headers list begins here ---
cat <<EOF >wxbase-headers.files
@('\n'.join(ALL_BASE_HEADERS.split()))
EOF
# --- wxBase headers list ends here ---

View File

@@ -1,19 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<include file="win32.bkl"/>
<set var="COMPILER">vc</set>
<include file="presets/fake.bkl"/>
<set var="ALL_SOURCES" eval="0">
$(MONOLIB_SRC) src/msw/dummy.cpp $(OPENGL_SRC)
</set>
<output file="$(OUTPUT_FILE)" writer="wx24dsp.empy"/>
<set var="FORMAT_OUTPUT_VARIABLES">
ALL_SOURCES ALL_HEADERS
</set>
</makefile>

View File

@@ -1,461 +0,0 @@
@{
used = {}
def mkgroup(lst, name, mask):
x = [s for s in lst if s.startswith(mask)]
for s in x:
used[s] = 1
x.sort()
return (name,x)
sources = ALL_SOURCES.split()
SOURCES = []
SOURCES.append(mkgroup(sources,'Common Files','src/common/'))
SOURCES.append(mkgroup(sources,'Generic Files','src/generic/'))
SOURCES.append(mkgroup(sources,'wxHTML Files','src/html/'))
SOURCES.append(mkgroup(sources,'MSW Files','src/msw/'))
otherSrcs = [x for x in sources if x not in used]
otherSrcs.sort()
SOURCES.append(('Other Sources', otherSrcs))
headers = [x for x in ALL_HEADERS.split() if x.endswith('.h')]
HEADERS = []
HEADERS.append(mkgroup(headers,'MSW','wx/msw/'))
HEADERS.append(mkgroup(headers,'Generic','wx/generic/'))
HEADERS.append(mkgroup(headers,'HTML','wx/html/'))
commonHdrs = [x for x in headers if x not in used]
commonHdrs.sort()
HEADERS.insert(0, ('Common', commonHdrs))
}@
# Microsoft Developer Studio Project File - Name="wxWindows" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
# TARGTYPE "Win32 (x86) Static Library" 0x0104
CFG=wxWindows - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "wxWindows.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "wxWindows.mak" CFG="wxWindows - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "wxWindows - Win32 Release Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Debug Unicode DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Release Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Debug Unicode" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Debug DLL" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "wxWindows - Win32 Release" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Debug" (based on "Win32 (x86) Static Library")
!MESSAGE "wxWindows - Win32 Release With Debug Info" (based on "Win32 (x86) Static Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../ReleaseUnicodeDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../ReleaseUnicodeDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdllu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250u.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../DebugUnicodeDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../DebugUnicodeDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdllud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250ud.dll" /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250ud.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../ReleaseUnicode"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../ReleaseUnicode"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswu" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswu.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../DebugUnicode"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../DebugUnicode"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswud" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "_UNICODE" /D "UNICODE" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswud.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../ReleaseDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../ReleaseDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/mswdll" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "NDEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "../include" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw250.dll"
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\expat.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../DebugDll"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../DebugDll"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WXWINDLL_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswdlld" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_USRDLL" /D "_DEBUG" /D "WXMAKINGDLL" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
RSC=rc.exe
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i "../include" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /out:"../lib/wxmsw250d.dll" /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\expatd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.5 /dll /machine:I386 /out:"../lib/wxmsw250d.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../Release"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "../lib"
# PROP BASE Intermediate_Dir "../Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "../lib"
# PROP Intermediate_Dir "../Debug"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MDd /W4 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD CPP /nologo /MDd /W4 /Zi /Od /I "../lib/mswd" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "_DEBUG" /D "__WXDEBUG__" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo
# ADD LIB32 /nologo /out:"..\lib\wxmswd.lib"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "wxWindows___Win32_Release_With_Debug_Info"
# PROP BASE Intermediate_Dir "wxWindows___Win32_Release_With_Debug_Info"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "ReleaseDebug"
# PROP Intermediate_Dir "ReleaseDebug"
# PROP Target_Dir ""
CPP=cl.exe
# ADD BASE CPP /nologo /MD /W4 /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
# ADD CPP /nologo /MD /W4 /Zi /O2 /I "../lib/msw" /I "../include" /I "./zlib" /I "./jpeg" /I "./png" /I "./regex" /I "./tiff" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D WINVER=0x0400 /D "STRICT" /D wxUSE_BASE=1 /Yu"wx/wxprec.h" /FD /c
RSC=rc.exe
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LIB32=link.exe -lib
# ADD BASE LIB32 /nologo /out:"..\lib\wxmsw.lib"
# ADD LIB32 /nologo /out:"..\lib\wxmsw.lib"
!ENDIF
# Begin Target
# Name "wxWindows - Win32 Release Unicode DLL"
# Name "wxWindows - Win32 Debug Unicode DLL"
# Name "wxWindows - Win32 Release Unicode"
# Name "wxWindows - Win32 Debug Unicode"
# Name "wxWindows - Win32 Release DLL"
# Name "wxWindows - Win32 Debug DLL"
# Name "wxWindows - Win32 Release"
# Name "wxWindows - Win32 Debug"
# Name "wxWindows - Win32 Release With Debug Info"
# Begin Source File
SOURCE="This project is deprecated, please see install.txt"
# End Source File
@[for group in SOURCES]@
# Begin Group "@group[0]"
# PROP Default_Filter ""
@[for src in group[1]]@
# Begin Source File
SOURCE=.\@src[4:].replace('/','\\')
@[if src=='src/msw/dummy.cpp']@
# ADD CPP /Yc"wx/wxprec.h"
@[end if]@
@[if src.endswith('.c')]@
# SUBTRACT CPP /YX /Yc /Yu
@[end if]@
# End Source File
@[end for]@
# End Group
@[end for]@
# Begin Group "Headers"
# PROP Default_Filter ""
# Begin Group "Setup"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\include\wx\msw\setup.h
!IF "$(CFG)" == "wxWindows - Win32 Release Unicode DLL"
# Begin Custom Build - Creating ..\lib\mswdllu\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdllu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdllu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
# Begin Custom Build - Creating ..\lib\mswdllud\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdllud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdllud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
# Begin Custom Build - Creating ..\lib\mswu\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswu/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswu\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode"
# Begin Custom Build - Creating ..\lib\mswud\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswud/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswud\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release DLL"
# Begin Custom Build - Creating ..\lib\mswdll\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdll/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdll\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
# Begin Custom Build - Creating ..\lib\mswdlld\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswdlld/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswdlld\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\msw\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug"
# Begin Custom Build - Creating ..\lib\mswd\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/mswd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\mswd\wx\setup.h
# End Custom Build
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release With Debug Info"
# Begin Custom Build - Creating ..\lib\msw\wx\setup.h from $(InputPath)
InputPath=..\include\wx\msw\setup.h
"../lib/msw/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
copy "$(InputPath)" ..\lib\msw\wx\setup.h
# End Custom Build
!ENDIF
# End Source File
# End Group
@[for group in HEADERS]@
# Begin Group "@group[0]"
# PROP Default_Filter ""
@[for hdr in group[1]]@
# Begin Source File
SOURCE=..\include\@hdr.replace('/','\\')
# End Source File
@[end for]@
# End Group
@[end for]@
# End Group
# End Target
# End Project

View File

@@ -1,80 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_LIBJPEG"/>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
wxjpeg$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_LIBJPEG">builtin</set>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1'">
wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)
</if>
</set>
</if>
<set var="INC_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>
</set>
<lib id="wxjpeg" template="3rdparty_lib"
cond="wxUSE_LIBJPEG=='builtin' and USE_GUI=='1' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<cflags-borland>-w-8004 -w-8008 -w-8057 -w-8066</cflags-borland>
<cflags-watcom>-wcd=136</cflags-watcom>
<sources>
src/jpeg/jcomapi.c
src/jpeg/jutils.c
src/jpeg/jerror.c
src/jpeg/jmemmgr.c
src/jpeg/jmemnobs.c
src/jpeg/jcapimin.c
src/jpeg/jcapistd.c
src/jpeg/jctrans.c
src/jpeg/jcparam.c
src/jpeg/jdatadst.c
src/jpeg/jcinit.c
src/jpeg/jcmaster.c
src/jpeg/jcmarker.c
src/jpeg/jcmainct.c
src/jpeg/jcprepct.c
src/jpeg/jccoefct.c
src/jpeg/jccolor.c
src/jpeg/jcsample.c
src/jpeg/jchuff.c
src/jpeg/jcphuff.c
src/jpeg/jcdctmgr.c
src/jpeg/jfdctfst.c
src/jpeg/jfdctflt.c
src/jpeg/jfdctint.c
src/jpeg/jdapimin.c
src/jpeg/jdapistd.c
src/jpeg/jdtrans.c
src/jpeg/jdatasrc.c
src/jpeg/jdmaster.c
src/jpeg/jdinput.c
src/jpeg/jdmarker.c
src/jpeg/jdhuff.c
src/jpeg/jdphuff.c
src/jpeg/jdmainct.c
src/jpeg/jdcoefct.c
src/jpeg/jdpostct.c
src/jpeg/jddctmgr.c
src/jpeg/jidctfst.c
src/jpeg/jidctflt.c
src/jpeg/jidctint.c
src/jpeg/jidctred.c
src/jpeg/jdsample.c
src/jpeg/jdcolor.c
src/jpeg/jquant1.c
src/jpeg/jquant2.c
src/jpeg/jdmerge.c
</sources>
</lib>
</makefile>

View File

@@ -1,80 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Support for application bundles, for wxWidgets samples.
-->
<!--
Nasty hack: use $(srcdir) to obtain usable CFBundleIdentifier suffix;
converts $(srcdir) like "../../samples/minimal" to "samples.minimal".
-->
<set var="BUNDLE_IDENTIFIER">
`echo $(DOLLAR)(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`
</set>
<set var="BUNDLE_PLIST">
$(TOP_SRCDIR)src/mac/carbon/Info.plist.in
</set>
<set var="BUNDLE_ICONS">
$(TOP_SRCDIR)src/mac/carbon/wxmac.icns
</set>
<define-tag name="wx-mac-app-bundle" rules="exe">
<!-- bundle directory: -->
<set var="BUNDLE">$(id).app/Contents</set>
<set var="BUNDLE_TGT">$(BUNDLE)/PkgInfo</set>
<set var="BUNDLE_TGT_REF">
<if cond="TOOLKIT=='MAC'">$(BUNDLE)/PkgInfo</if>
<if cond="TOOLKIT=='COCOA'">$(BUNDLE)/PkgInfo</if>
</set>
<add-target target="$(BUNDLE_TGT)" type="action"/>
<modify-target target="$(BUNDLE_TGT)">
<!-- required data: -->
<depends>$(id)</depends>
<depends-on-file>$(BUNDLE_PLIST)</depends-on-file>
<depends-on-file>$(BUNDLE_ICONS)</depends-on-file>
<command>
<!-- create the directories: -->
mkdir -p $(BUNDLE)
mkdir -p $(BUNDLE)/MacOS
mkdir -p $(BUNDLE)/Resources
<!-- Info.plist: -->
sed -e "s/IDENTIFIER/$(BUNDLE_IDENTIFIER)/" \
-e "s/EXECUTABLE/$(id)/" \
-e "s/VERSION/$(WX_VERSION)/" \
$(BUNDLE_PLIST) >$(BUNDLE)/Info.plist
<!-- PkgInfo: -->
echo -n "APPL????" >$(BUNDLE)/PkgInfo
<!-- make a hardlink to the binary: -->
ln -f $(ref("__targetdir",id))$(ref("__targetname",id)) $(BUNDLE)/MacOS/$(id)
<!-- ditto wxWidgets resources and icons: -->
cp -f $(BUNDLE_ICONS) $(BUNDLE)/Resources/wxmac.icns
</command>
</modify-target>
<!-- add pseudo target id_bundle: -->
<add-target target="$(id)_bundle" type="phony"
cond="PLATFORM_MACOSX=='1'"/>
<modify-target target="$(id)_bundle">
<dependency-of>all</dependency-of>
<depends>$(BUNDLE_TGT_REF)</depends>
</modify-target>
<!-- "make clean" should delete the bundle: -->
<modify-target target="clean">
<command>rm -rf $(id).app</command>
</modify-target>
</define-tag>
</makefile>

File diff suppressed because it is too large Load Diff

View File

@@ -1,39 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(ODBC_SRC) $(QA_SRC)
$(DBGRID_SRC) $(XRC_SRC)
</if>
</set>
<set var="MONOLIB_SRC">
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(NET_SRC) $(MONOLIB_GUI_SRC) $(XML_SRC)
</set>
<dll id="monodll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</dll>
<lib id="monolib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='1'">
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC) $(PLUGIN_MONOLIB_SRC)</sources>
<msvc-headers>$(ALL_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">mono=monolib+monodll</set>
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MONOLIB" append="1">gl=gllib+gldll</set>
</makefile>

View File

@@ -1,268 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================= -->
<!-- wxBase library -->
<!-- ================================================================= -->
<dll id="basedll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL_BASE</define>
<define>wxUSE_BASE=1</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</dll>
<lib id="baselib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<define>wxUSE_BASE=1</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<msvc-headers>$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">base=baselib+basedll</set>
<!-- ================================================================= -->
<!-- wxNet library -->
<!-- ================================================================= -->
<dll id="netdll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_NET</define>
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
<library>basedll</library>
</dll>
<lib id="netlib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(NET_SRC)</sources>
<msvc-headers>$(NET_CMN_HDR) $(NET_PLATFORM_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">net=netlib+netdll</set>
<!-- ================================================================= -->
<!-- Main GUI library -->
<!-- ================================================================= -->
<dll id="coredll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_CORE</define>
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
<library>basedll</library>
</dll>
<lib id="corelib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>wxUSE_BASE=0</define>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">core=corelib+coredll</set>
<!-- ================================================================= -->
<!-- "Advanced" controls library -->
<!-- ================================================================= -->
<dll id="advdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ADV</define>
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
<library>htmldll</library>
<library>xmldll</library>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(PLUGIN_ADV_EXTRALIBS)</ldlibs>
</dll>
<lib id="advlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(ADVANCED_SRC) $(PLUGIN_ADV_SRC)</sources>
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">adv=advlib+advdll</set>
<!-- ================================================================= -->
<!-- wxMedia classes library -->
<!-- ================================================================= -->
<dll id="mediadll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_MEDIA</define>
<sources>$(MEDIA_SRC)</sources>
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
</dll>
<lib id="medialib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(MEDIA_SRC)</sources>
<msvc-headers>$(MEDIA_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">media=medialib+mediadll</set>
<!-- ================================================================= -->
<!-- DB classes library -->
<!-- ================================================================= -->
<dll id="odbcdll" template="wx_base_dll"
cond="SHARED=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_ODBC</define>
<sources>$(ODBC_SRC)</sources>
<msvc-headers>$(ODBC_HDR)</msvc-headers>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_ODBC)</ldlibs>
</dll>
<lib id="odbclib" template="wx_base_lib"
cond="SHARED=='0' and USE_ODBC=='1' and MONOLITHIC=='0'">
<sources>$(ODBC_SRC)</sources>
<msvc-headers>$(ODBC_HDR)</msvc-headers>
</lib>
<dll id="dbgriddll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_DBGRID</define>
<sources>$(DBGRID_SRC)</sources>
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
<library>advdll</library>
<library>odbcdll</library>
<library>coredll</library>
<library>basedll</library>
</dll>
<lib id="dbgridlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_ODBC=='1' and MONOLITHIC=='0'">
<sources>$(DBGRID_SRC)</sources>
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">odbc=odbclib+odbcdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">dbgrid=dbgridlib+dbgriddll</set>
<!-- ================================================================ -->
<!-- wxHTML -->
<!-- ================================================================ -->
<dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_HTML</define>
<sources>$(HTML_SRC)</sources>
<library>coredll</library>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</dll>
<lib id="htmllib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_HTML=='1' and MONOLITHIC=='0'">
<sources>$(HTML_SRC)</sources>
<msvc-headers>$(HTML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">gl=gllib+gldll</set>
<!-- ================================================================ -->
<!-- QA -->
<!-- ================================================================ -->
<dll id="qadll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_QA</define>
<sources>$(QA_SRC)</sources>
<msvc-headers>$(QA_HDR)</msvc-headers>
<library>coredll</library>
<library>basedll</library>
<library>xmldll</library>
</dll>
<lib id="qalib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_QA=='1' and MONOLITHIC=='0'">
<sources>$(QA_SRC)</sources>
<msvc-headers>$(QA_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">qa=qalib+qadll</set>
<!-- ================================================================ -->
<!-- XML -->
<!-- ================================================================ -->
<dll id="xmldll" template="wx_base_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XML</define>
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
<library>basedll</library>
<ldlibs>$(EXTRALIBS_XML)</ldlibs>
</dll>
<lib id="xmllib" template="wx_base_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(XML_SRC)</sources>
<msvc-headers>$(XML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xml=xmllib+xmldll</set>
<!-- ================================================================ -->
<!-- XRC -->
<!-- ================================================================ -->
<dll id="xrcdll" template="wx_dll"
cond="SHARED=='1' and USE_XRC=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_XRC</define>
<sources>$(XRC_SRC)</sources>
<library>htmldll</library>
<library>advdll</library>
<library>coredll</library>
<library>xmldll</library>
<library>basedll</library>
<msvc-headers>$(XRC_HDR)</msvc-headers>
</dll>
<lib id="xrclib" template="wx_lib"
cond="SHARED=='0' and USE_XRC=='1' and MONOLITHIC=='0'">
<sources>$(XRC_SRC)</sources>
<msvc-headers>$(XRC_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">xrc=xrclib+xrcdll</set>
</makefile>

Some files were not shown because too many files have changed in this diff Show More