Compare commits

...

1408 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
Roger Gammans
8fc856de1f Fix bug [1297817] - applied suggested patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37054 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 13:45:34 +00:00
Robert Roebling
7bc5ddc6e4 Applied MIME-types patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37053 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 13:22:56 +00:00
Stefan Neis
e918f0582c Moved os2/private.h to BASE_OS2_HDR.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 11:37:58 +00:00
Mart Raudsepp
773a50563e Add a "see also" note for wxScrollWinEvent for wxWindow::SetScrollbar. Closes bug #1083738
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 05:12:43 +00:00
Jamie Gadd
413553cc60 Distinguish numpad extended keys. Fixes bug #1327720
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-22 05:04:31 +00:00
Michael Wetherell
9d309aad76 Rebake all the VC++ project files and makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 23:06:27 +00:00
Michael Wetherell
1b48afd23d Move oleacc.lib from the VC++ projects/makefiles to libraries.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 22:50:46 +00:00
Michael Wetherell
aee06d92ae Update with location of SP3 for VC++ 5.0 (Jan Jezabek)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 22:44:12 +00:00
Robin Dunn
d6c09fee7c Use wxSUBRELEASE_NUMBER for the file version, not wxBETA_NUMBER. Also
update copyright year


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 22:39:46 +00:00
Mart Raudsepp
17f0e75e6c Lets have a close box for the DnDShapeDialog in the dnd sample
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 18:08:06 +00:00
Julian Smart
2834deba05 Fixed bug [ 1361674 ] Document wxDocMDIParentFrame::Create
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 17:49:48 +00:00
Julian Smart
74aa825413 Typo fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 17:38:46 +00:00
Julian Smart
ca59e724aa Fix for bug [ 1335450 ] Replace all << by &lt;&lt; and >> by &gt;&gt;
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37038 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 17:31:38 +00:00
Julian Smart
64c288fa47 Compile with wxUSE_DYNLIB_CLASS and wxUSE_WXDIB set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 16:47:30 +00:00
Julian Smart
14d776932c Fix for [ 1351655 ] wxTextValidator::OnChar not working with numeric filter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 15:13:00 +00:00
Julian Smart
f7f00d8a1d Fix for bug [ 1351659 ] wxTextValidator::Validate not Unicode safe
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 15:09:20 +00:00
Julian Smart
7e81ff236f Bug [ 1355450 ] wxSplitterWindow overview shows horizontal says vertical
Fixed wrong orientation documentation


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 15:04:02 +00:00
Julian Smart
cc5fb8a7cd Applied patch [ 1409971 ] wxX11: fix for DoDrawBitmap() when scaling is set
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 14:45:47 +00:00
Stefan Csomor
58debe514f adding new event loop implementation, removing aga.cpp (outdated)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 12:18:26 +00:00
Stefan Csomor
d25d7be8a7 adjust subbitmap mask code to new representation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 12:16:57 +00:00
Robin Dunn
e1cceb75f0 Since this window draws its own background, set the custom bg style.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 07:07:28 +00:00
Robin Dunn
2f8102974b Changes needed for SWIG 1.3.27
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 06:45:34 +00:00
Vadim Zeitlin
4651212662 document other SetValue() overloads
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 03:25:31 +00:00
Michael Wetherell
b5d09a5fb8 Remove wxGetOsDescription from MGL's utils, and add it to msdos's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-21 01:34:42 +00:00
Stefan Csomor
487eedb8d8 using a dynamic cast to wxFrame in order to get the MenuBar correctly from the frontmost window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 21:16:55 +00:00
David Surovell
be6068f6c3 fixed compilation errors in prior checkin; some minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 19:49:10 +00:00
Robin Dunn
10694396b6 Added some (#ifdef'd out) wrappers to help in debugging the swig
runtime swig_type_info structures.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 18:18:02 +00:00
Robin Dunn
5551baca88 corrections for some SWIG deprecation warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 18:11:53 +00:00
Robin Dunn
a9f3f5a614 Patch for Bug 1409256, wxversion.py does not understand lib and lib64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 17:32:43 +00:00
Robin Dunn
1631143c6f Updates for CreateButtonSizer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 17:26:29 +00:00
Robin Dunn
893d597c7b prevent overload abiguity in wxPyPrintPreview ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 17:23:59 +00:00
Robin Dunn
e054c6ad5c Added ConvertToGreyscale
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 17:23:02 +00:00
Stefan Csomor
d059fe4a3c Supporting a SetMenuBar call when this frame is already showing its menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 17:17:05 +00:00
Stefan Csomor
8cba326d4e allow for a range value of SInt32 instead of SInt16
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 17:15:15 +00:00
Michael Wetherell
fec4df061a Update notes on VC++ 5.0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 02:52:49 +00:00
Vadim Zeitlin
6f73419b90 always initialize m_bChanged in wxConfigPathChanger ctor; this could result in difficult to reproduce bugs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 00:55:52 +00:00
Vadim Zeitlin
d9f5d54a5a don't look beyond the end of the string if it ends with a backslash in FilterInEntryName() (thanks Purify)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-20 00:55:17 +00:00
Włodzimierz Skiba
c616c2e834 Checkable items in wxToolMenuBarTool supported.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 22:03:03 +00:00
David Surovell
b156929dd0 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 18:32:23 +00:00
Jamie Gadd
b7a3ba7dcd Fixed bug #778299 - wxTE_RICH2 causes SetValue to show control.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 15:27:17 +00:00
Julian Smart
eb5d9594db Applied patch [ 1378183 ] Mac: wxNotebook::HitTest off by one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 11:03:56 +00:00
Julian Smart
e90411c2c1 Applied patch [ 1331340 ] faster Drawing of Polygons and Polylines
Chris Borgolte


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 10:33:33 +00:00
Julian Smart
dbccd1c261 Applied patch [ 1381420 ] wxHTTP Basic authentication support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 10:28:22 +00:00
Julian Smart
175ec4c86d Applied patch [ 1374618 ] Fix wxJoystick::GetXMin/Max (bug 1374480)
Ryan Norton


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 10:16:53 +00:00
Julian Smart
ec85956ae9 Applied patch [ 1339764 ] Add wxImage::ConvertToGreyscale
Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 09:55:15 +00:00
Julian Smart
f96a9d34e6 Applied patch [ 1355809 ] Add ability to use templates with static event tables
Jamie Gadd


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 09:42:54 +00:00
Julian Smart
20f82e1372 Added toggle event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 09:36:57 +00:00
Jouk Jansen
d12609bf8f Committing in .
Updated OpenVMS compile support

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


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 08:33:52 +00:00
Julian Smart
4fe41ce625 Don't use Windows handles directly in headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 07:37:18 +00:00
Mart Raudsepp
df311d21f5 Update copyright year in ctrl+alt+mclick dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-19 01:05:57 +00:00
Michael Wetherell
945bd4747c Remove workaround since the problem should now be fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 22:58:32 +00:00
Julian Smart
553d7089d0 Improved mktime for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 22:06:24 +00:00
Julian Smart
08bce50191 Cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 22:02:49 +00:00
David Surovell
ba4afb6b8a cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 19:41:30 +00:00
Włodzimierz Skiba
0ea273496a Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 19:10:49 +00:00
Julian Smart
4deaa8dbc5 Fixed comment bug [ 1390056 ] Wrong Documentation for TransferFromWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 17:23:05 +00:00
Julian Smart
faeb3cedce Applied patch [ 1380544 ] wxCondition::WaitTimeout() return value when timeout occurs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:56:07 +00:00
Julian Smart
25f182c18b Applied patch [ 1325857 ] CJK input method doesn't work properly(GTK, CVS)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:51:09 +00:00
Vadim Zeitlin
abe64011cd use Cmd-C under Mac to copy text, not Ctrl-C
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:47:42 +00:00
Julian Smart
3f5c62f982 Reverted semicolons patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:45:41 +00:00
Julian Smart
9f8130d6b3 Must strip menu codes from labels before measuring (fixes bug 1400552)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 16:16:36 +00:00
Vadim Zeitlin
90c4e038d0 declare wxEVT_COMMAND_HTMLWINDOW_URL_CLICKED with correct DLL decl spec (fixes DLL build warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 15:30:20 +00:00
Julian Smart
700d0a9a6b Applied doc patch [ 1341459 ] wxDatePickerCtrl::SetFormat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 14:16:35 +00:00
Julian Smart
d5e29b951b Applied patch [ 1373215 ] Codewarrior 9 (+?) warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 14:13:20 +00:00
Julian Smart
696b38f7f5 Applied patch [ 1255676 ] stc2wx/wx2stc not exported (Win32 Unicode DLL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 13:27:36 +00:00
Julian Smart
416f976440 Applied patch [ 1334242 ] wxLogStream::DoLogString fix for unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 13:20:40 +00:00
Julian Smart
7eeba5114c Applied patch [ 1304191 ] support for MEMO fields
Francesco Montorsi


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 13:15:04 +00:00
Julian Smart
749da44287 Applied patch [ 1188724 ] missing header in carbon CFM builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 13:02:17 +00:00
Julian Smart
ac6178d747 Applied patch [ 1381895 ] remove circular include dependendcy in wxchar.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 12:46:11 +00:00
Julian Smart
77bf709fe7 Reordering so most likely to fail are at end
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 12:29:23 +00:00
Julian Smart
ff96483989 Unicode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 12:26:08 +00:00
Julian Smart
2c1957beb8 Allow compilation of samples to continue with wxUSE_DISPLAY set to 0 (the default)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 11:48:28 +00:00
Julian Smart
edef87c827 Applied patch [ 1399013 ] More removals of extraneous semicolons
Wlodek Szafran


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 11:46:53 +00:00
Julian Smart
c66d0fc3e8 Applied patch [ 1394164 ] Update wxWinINetURL to use wxURI
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 11:25:47 +00:00
Julian Smart
70b6d39412 Applied part of patch [ 1304579 ] fix click bug in wxCalendarCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 10:38:54 +00:00
Julian Smart
3b2b40b45f Applied patch [ 1306443 ] Removal of C++-style comments from C files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 10:25:04 +00:00
Julian Smart
55a667b658 Applied patch [ 1382329 ] [msw] SetScrollbar: Set thumbsize before triggering events
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 10:12:31 +00:00
Julian Smart
c1fa940272 Applied patch [ 1325207 ] Fixes unicode build using Solaris with Sun's SunPro compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 10:06:34 +00:00
Julian Smart
767457cb3d Added missing include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 09:59:59 +00:00
Julian Smart
4a99d87f2c Applied patch [ 1312729 ] fix for wxMac Carbon spin control on EVT_TEXT emitter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 09:55:40 +00:00
Julian Smart
6091caf088 Applied patch [ 1381016 ] wxFileName should use TMPDIR
Paul Cornett


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36946 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 09:44:03 +00:00
Julian Smart
4ee8e5cde3 Don't pass wxALIGN_ flags to wxButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 09:16:59 +00:00
Julian Smart
48ba35c357 Two corrections to const fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 08:34:03 +00:00
David Surovell
717a70722e cleanup - remove duplicate decl., added #include, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-18 03:40:58 +00:00
Julian Smart
074308476d Applied patch [ 1378522 ] fixed bitmap w/alpha->icon/cursor conversion
Vince Harron


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 20:06:00 +00:00
Julian Smart
99cc862c0f WinCE compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36940 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 19:56:51 +00:00
Julian Smart
b486658282 Applied patch [ 1336712 ] Fix segfault when calling wxThread::Exit()
By bdonner


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36939 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 19:17:40 +00:00
Julian Smart
8db1a709bc Eliminated a VC++ 8 warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 19:10:48 +00:00
Julian Smart
2ad75f457d Applied patch [ 1392288 ] FIX: Bug 1306671 Build Error in list.h with VC2005
By Kevin J Bluck, with mods by JS


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 19:02:39 +00:00
Włodzimierz Skiba
bcfa2b3184 Minor cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 18:26:28 +00:00
Julian Smart
7a59be6d97 Applied patch [ 1401000 ] Fixes Unix domain sockets under darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36935 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 18:10:17 +00:00
Julian Smart
5090e3ad5c Applied patch [ 1373007 ] Document wxPROCESS_ENTER in wxComboBox
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36934 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 18:04:07 +00:00
Robin Dunn
a1da78b331 MSW Support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 17:35:11 +00:00
Julian Smart
4c81b43195 Committed forgotten files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36932 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:59:02 +00:00
Julian Smart
fc6f2a33b6 Applied patch [ 1405547 ] wxDbConnectInf + unicode = massive buffer overflows
Ove Kaaven


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36931 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:51:40 +00:00
Julian Smart
4a52844365 Applied patch [ 1374215 ] Bug fix to wxSpinCtrl for Windows
Update valid value on kill focus
By peter1079


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:47:55 +00:00
Julian Smart
14e9e56dfe Cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:24:35 +00:00
Julian Smart
0026e0f231 Applied patch [ 1393577 ] show volumename in dirctlg
Viktor P


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:20:20 +00:00
Julian Smart
3dece6c4bc Applied patch [ 1382552 ] Fixes GDI-ressource leak in wxStaticBitmap
Robert N.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:08:59 +00:00
Julian Smart
0975a8a065 Applied patch [ 1405821 ] wxVListBox double-buffering + fix to a scrolling issue
By Jaakko Salli


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 16:00:43 +00:00
Julian Smart
2fb0cabbf9 Applied patch [ 1407318 ] bitmap clipping / transparency mask (X11 port)
By Burkhard Fischer


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 15:53:56 +00:00
Julian Smart
a9d9e2f262 Applied patch [ 1389709 ] XP theme support for DrawHeaderButton, DrawTreeItemButton
By Chris Mellon


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 15:41:26 +00:00
Julian Smart
88a01064f0 Applied patch [ 1349607 ] [msw] Multiline notebook tab label change can add extra row
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 15:37:04 +00:00
Julian Smart
a376adb6ee Applied patch [ 1369264 ] added note for wxListCtrl::OnGetItemAttr( long item)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 15:23:40 +00:00
Julian Smart
5920453088 Improved ugly custom tool button drawing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 15:05:08 +00:00
Julian Smart
89a3f5c91f Applied patch [ 1345297 ] Crash with MSW wxPrintDialog when pressed OK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 09:53:14 +00:00
Julian Smart
780d7317ed Applied patch [ 1385822 ] fixed stdpaths get folder path on WinCE
Vince Harron


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 09:46:27 +00:00
Julian Smart
f1a777fee4 Applied patch [ 1340814 ] fix for wxTextCtrl::GetStyle
Aron Pongo


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 09:38:32 +00:00
Julian Smart
d8a832f38f Applied patch [ 1370718 ] WinCE does not support drive letters
Mike Wolfram


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 09:28:52 +00:00
Julian Smart
568c0346fc Applied patch [ 1344168 ] wxUniv (on MSW) IM input no response
By Danny Raynor


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 09:25:34 +00:00
Robin Dunn
4617be085f Another merge of 2.6 changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 05:42:30 +00:00
Robin Dunn
f3ebbc0ac8 Remove the busy-wait loops in wxAMMediaBackend::Play as they didn't
work right anyway...

Also silence some log messages when a failure is expected from
wxCheckWindowWndProc.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 04:20:56 +00:00
Robin Dunn
05886ed3f2 Enable wxListCtrl in report mode to be able to use images in other
columns, if ComCtl32 >= 470.  All it needed was to add the
LVS_EX_SUBITEMIMAGES style, everything else was already in place, and
the generic control already supports it too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-17 02:13:06 +00:00
Włodzimierz Skiba
13ff248506 Watcom fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 20:10:17 +00:00
Włodzimierz Skiba
2265a4a930 wxOS2 build system for OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 20:08:37 +00:00
Włodzimierz Skiba
fd48be45a7 wxMGL build system for OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 16:33:44 +00:00
Włodzimierz Skiba
81ba610721 Avoid conflict between wxWindow::Enable and MyFrame::Enable.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 16:09:49 +00:00
Włodzimierz Skiba
4219b5e7c7 Code cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 16:05:58 +00:00
Włodzimierz Skiba
922bcaff46 Towards other setups.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 16:04:40 +00:00
Włodzimierz Skiba
ead190e478 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 15:51:35 +00:00
Mart Raudsepp
99879bbf15 Regenerate after latest changes to configure.in (GTK_NO_CHECK_CASTS removal for gtk2 and gsocket related identation
changes).
Does gsocket work still/now?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 15:45:19 +00:00
Mart Raudsepp
0c897818d3 GTK_NO_CHECK_CASTS is a gtk1 only thing, so don't put it to CPPFLAGS with gtk2.
It's been renamed to G_NO_CHECK_CASTS in gtk2 stack, but we don't appear to need it.
Why do we need to supress cast checks for gtk1?


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 15:42:41 +00:00
Włodzimierz Skiba
bee413eeb7 msw/private.h is included from filefn.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 15:41:54 +00:00
Mart Raudsepp
63ec432bd7 Move constant strings to .rodata/.data.rel.ro ELF segment from .data by making them really const.
If any more exotic toolchain decides to not export these strings into the core library anymore, let me know. Try to
compile the notebook sample, for example.
TODO: Move strings not meant for wxCore out of wxCore to the appropriate library.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 14:59:55 +00:00
Vadim Zeitlin
3dbfe8f44f reset g_SelectionBeforePopup sooner in gtk_popup_hide_callback() to ensure that GetSelection() returns the new selection when called from wxEVT_COMMAND_COMBOBOX_SELECTED handler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-16 02:31:40 +00:00
Stefan Neis
bf58daba38 Some OS/2 specific improvements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 22:16:02 +00:00
Vadim Zeitlin
9052e07db8 just reindented properly (while trying to understand what this check does...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 21:39:32 +00:00
Włodzimierz Skiba
f24391587c Build fix for wxTheApp usage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 10:15:28 +00:00
Włodzimierz Skiba
cafed23657 Build fix for wxWindowMSW used in header.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 10:13:40 +00:00
Włodzimierz Skiba
897b24cf5c More common code moved from generic dialogs to wxDialogBase::CreateButtonSizer(). New system option 'wince.dialog.real-ok-cancel'.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 10:06:15 +00:00
David Surovell
f3078f075b cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 07:20:59 +00:00
Mart Raudsepp
619996567a Convert line-endings to proper style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 01:42:13 +00:00
Mart Raudsepp
dea83db4c4 Don't extern declare wxDialogNameStr twice in include/wx/mac/classic/dialog.h either...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 01:29:45 +00:00
Mart Raudsepp
4dff8e4b8a Don't extern declare wxDialogNameStr twice
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-15 01:27:09 +00:00
Mart Raudsepp
3d257b8db1 Remove stray whitespaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 18:32:37 +00:00
Mart Raudsepp
487af9c3b1 Regenerated after getaddr* fixes in configure.in
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 18:26:50 +00:00
Stefan Neis
539ae551cf Ensure "reasonable" return values even if none of the #ifdef conditions in
wxGet{host,serv}by{name,addr}_r matches.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 13:30:58 +00:00
Stefan Neis
b41e7f68a3 Temporarily (?) commented the code for testing for getaddrinfo.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 13:07:42 +00:00
David Surovell
bf473da729 fixed crash introduced in v1.41
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 08:49:42 +00:00
David Surovell
e22ab33a47 cleanup - reformat ()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 08:25:42 +00:00
David Surovell
876b960ac2 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 07:56:26 +00:00
David Surovell
a571434502 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 07:31:29 +00:00
David Surovell
0f4c3aa2cc removed extraneous spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36867 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-14 06:55:06 +00:00
Robin Dunn
b93328d842 Only update the size if the parent is a frame and the frame is
managing the size of this toolbar, otherwise assume that something
else (like a sizer) is managing the layout of this toolbar and leave
it alone.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 23:21:57 +00:00
Vadim Zeitlin
0d7f75df79 return correct client size for child window which are being defer-resized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 22:07:44 +00:00
Vadim Zeitlin
c70ffbdbf0 fixed crash with ownerdrawn menu items accelerators (Perry Miller)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 21:03:19 +00:00
Stefan Csomor
2c556733b8 gcc 3.3 for ppc and gcc 4.0 for i386, static and dynamic builds, 10.3 minimum
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 17:44:00 +00:00
Stefan Csomor
9b6bbdccba gcc 3.3 for ppc and gcc 4.0 static and dynamic builds 10.3 minimum
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 17:42:21 +00:00
Robin Dunn
6b6e73390c Fix for MSVC 6 compile error
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 05:22:16 +00:00
Robin Dunn
091f5bedb4 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 05:21:18 +00:00
Robin Dunn
80667df394 Added GetFrame and GetDialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 05:19:07 +00:00
Robin Dunn
dfdaab0470 wx.EventLoop is now implemented for wxMac.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 04:07:35 +00:00
Jamie Gadd
3a96aa4afa Add missing WINDOWPOS flags for WinCE build to include/wx/msw/wince/missing.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 01:33:33 +00:00
Vadim Zeitlin
5b87e74ace added missing default value for wxEventLoopManual::Exit() parameter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 01:32:38 +00:00
Vadim Zeitlin
b80e8ac983 updated to derive from wxEventLoopManual
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-13 01:31:37 +00:00
Vadim Zeitlin
71e86b08be wxEventLoop::ms_activeLoop is now defined in its own file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-12 23:10:29 +00:00
Vadim Zeitlin
52c9b34907 don't compile wxEventLoopManual for the ports which don't need it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-12 23:10:03 +00:00
Vadim Zeitlin
c8026dea6c improved wxMac event loop implementation and refactored the code to share it with wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-12 23:06:26 +00:00
Vadim Zeitlin
4d90072c22 implemented wxEventLoop for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36846 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-12 20:09:00 +00:00
Vadim Zeitlin
25e2f480a7 define wxEventLoopBase::ms_activeLoop in appcmn.cpp instead of doing it in all platform-dependent evtloop.cpp files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36845 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-12 18:57:28 +00:00
Vadim Zeitlin
77fb1a02aa share wxEventLoop::IsRunning() implementation between all ports; moved wxEventLoopActivator used by it in wx/evtloop.h instead of duplicating it in 3 different .cpp files (and not using it at all in 3 other ones)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-12 16:56:48 +00:00
Kevin Hock
f29d3d6133 Change reference from GetForce to CanVeto
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-12 15:25:26 +00:00
David Surovell
2ef66617a5 fixed include file rename issue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 23:58:52 +00:00
Jouk Jansen
76241d0f75 Committing in .
1 ; too many

 Modified Files:
 	wxWidgets/include/wx/html/helpwnd.h
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 13:26:42 +00:00
Jouk Jansen
fb7a833635 Committing in .
OpenVMS update

 Modified Files:
 	wxWidgets/setup.h_vms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 10:36:48 +00:00
Julian Smart
3ac95ecd61 Corrected accessor names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 09:08:31 +00:00
Julian Smart
4e1ed07b52 Typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 09:00:33 +00:00
Julian Smart
f3e156efb0 Renamed helpwin.h/cpp to helpwnd.h/cpp to avoid clash
Added back GetFrame/GetDialog for compatibility and consistency


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-11 08:59:17 +00:00
Robin Dunn
aec7c82991 One last change from Chris. Delays handling a resize event until 50ms
after the last event.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 23:49:18 +00:00
Robin Dunn
17991ec034 merge #4 from 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 23:15:38 +00:00
Jamie Gadd
f01fbad837 Mention statusbar painting fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 22:08:52 +00:00
Jamie Gadd
dd28827a04 Repainting fixes/improvements. Use SWP_NOCOPYBITS for statusbars, don't activate when using DeferWindowPos and remove WM_WINDOWPOSCHANGED code (no longer necessary).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 21:37:16 +00:00
Włodzimierz Skiba
d9170b47d1 wxCalendarCtrl: positioning fixes and colours following system settings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 21:08:07 +00:00
Włodzimierz Skiba
f9cc9706e4 wxWinCE (small screen) adjustements. Added possible testing of sizable calendar control.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 21:00:44 +00:00
Włodzimierz Skiba
740af654d1 Watcom does not accept #warning but supports more than MSW port.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36813 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 19:39:28 +00:00
Włodzimierz Skiba
fc038829d5 wxMGL/Watcom linkage fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 16:52:02 +00:00
David Surovell
a02d6c7b19 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 04:10:57 +00:00
David Surovell
ffafe6ca89 cleanup - reformat - 4th pass
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-10 03:47:35 +00:00
Robin Dunn
42781abb2f Added wxHelpControllerBase, wxHtmlHelpDialog, wxHtmlHelpWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 23:05:54 +00:00
Robin Dunn
486afba9a4 Merge #3 from the 2.6 branch, containing last set of changes before
the 2.6.2 release.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 21:09:57 +00:00
David Surovell
f533e26f39 add new wxHTML headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 17:47:06 +00:00
Julian Smart
13344b2557 Made the HTML command ids visible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 17:06:05 +00:00
Julian Smart
3755cfa64d Moved wxHtmlHelpFrame functionality to wxHtmlHelpWindow to allow
for embedded and modal help


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 13:42:57 +00:00
Vadim Zeitlin
1737dac20a fix SetUserData() to delete the correct pointer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 12:27:49 +00:00
Vadim Zeitlin
df885241b0 fix for Unicode builds under OS X <= 10.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 12:27:18 +00:00
Vadim Zeitlin
6bcf450c6e document that wxDC can't be created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 12:25:06 +00:00
David Surovell
274b7a40ef cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 09:46:05 +00:00
Robin Dunn
633ecf268b Fix for wxMac when the tree doesn't have the focus and the
wxSYS_COLOUR_HIGHLIGHTTEXT is white.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 02:57:04 +00:00
David Surovell
43524b1583 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 00:46:43 +00:00
Vadim Zeitlin
2dc62891c4 moved OnExceptionInMainLoop() from wxAppConsole to wxAppBase because
1. console apps have no main loop
2. in non-monolithic mingw32 build, rethrowing an exception thrown from the
   GUI in the base DLL doesn't work


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 00:12:49 +00:00
Włodzimierz Skiba
57436bb7db Minor reformat.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 00:09:43 +00:00
Vadim Zeitlin
9b38386f3d mention that wxMULTIPLE flag doesn't make sense with wxFileSelector
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 00:09:01 +00:00
Włodzimierz Skiba
c54de5ae9d defs.h doubled include fixed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 00:06:50 +00:00
Włodzimierz Skiba
3ab14c038b wxMGL bakefiled for OpenWatcom (needs bakefiles from CVS but compatible with bkl 0.1.9.X for other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-09 00:03:54 +00:00
Włodzimierz Skiba
43b0b6bc59 wxMGL bakefiled for OpenWatcom (needs bakefiles from CVS but compatible with bkl 0.1.9.X for other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 23:58:18 +00:00
Robert Roebling
bcd846ea71 Added empty wxDataViewCtrl header and control name string.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 21:50:02 +00:00
Robert Roebling
20e34ecc5b Added configure flag for wxDataViewCtrl.
Currently defaults to "no".


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 21:23:35 +00:00
Robert Roebling
3565d13520 Added configure checks for Hildon Framework.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 21:18:16 +00:00
David Surovell
d48e6fea6b fixed a typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 18:52:36 +00:00
David Surovell
7fe44deeab minor cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 18:52:03 +00:00
David Surovell
5fa7a49ce3 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 18:51:24 +00:00
Robert Roebling
bd6169a60e Added sample for wxDataViewCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 16:23:03 +00:00
Jamie Gadd
1feb5443ff Return correct values for GetFieldRect() when using themes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 15:33:30 +00:00
Jamie Gadd
2919a8b5af InsertMenuItem can be used by submenus having bitmaps also
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 13:28:52 +00:00
Vadim Zeitlin
9452e8789b fixes for Unicode build with CodeWarrior under OS X 10.2 (patch 1373217)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 12:19:14 +00:00
Vadim Zeitlin
70e51d6918 fixed check for Metrowerks mbstowcs(): check for __MSL__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36774 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 12:09:03 +00:00
Stefan Csomor
4c5dae083d allowing ampersands in choices and comboboxes means we have to strip outside of uma.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36773 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 10:54:32 +00:00
Stefan Neis
127189ebec Replaced get{host,serv}by{name,addr} by the threadsafe wrappers
introduced in the previous revision.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-08 01:33:58 +00:00
David Surovell
78606adf3a fixed typo in prior checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 17:43:39 +00:00
David Surovell
172da31f53 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 17:29:16 +00:00
Stefan Csomor
93a2b888fc bug fix for MacTel builds, using the same code on PPC as well (wxMask)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 08:33:13 +00:00
David Surovell
73c902d669 minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 06:30:25 +00:00
David Surovell
1c4cd9e047 minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 06:09:50 +00:00
David Surovell
efb064f747 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 06:01:50 +00:00
Vadim Zeitlin
e45a688549 refresh the MDI frame window menu whenever a child frame is shown/hidden (and not only when its menu bar is changed as this means that the menu is never refreshed if the child frame has no menu)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 01:14:45 +00:00
Vadim Zeitlin
290c74fbed just added wxUSE_MENUS around code using the menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 01:12:49 +00:00
Vadim Zeitlin
90392f9cc9 removed Win16 code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 01:05:52 +00:00
Vadim Zeitlin
1ecf2613d0 added a test command to show the current selection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-07 00:31:32 +00:00
Stefan Neis
a4ebf7ba61 Integrated fixes for sizing/positioning; cleanup; removal of handle/window
association in dtor. (All according to patch #1396667).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 23:43:45 +00:00
Stefan Neis
179db36df4 Fixed sizing&positioning and an error in subclassing.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 22:31:00 +00:00
Stefan Neis
154daa940e Cosmetic fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 22:26:15 +00:00
Vadim Zeitlin
5ad1f9028d Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 21:44:44 +00:00
Vadim Zeitlin
b7d4a1b0aa fixed bug in GetString() introduced during the latest round of changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 21:41:54 +00:00
Vadim Zeitlin
06ef151178 added GetString() test
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 21:33:39 +00:00
David Surovell
bb64b8bdd5 cleanup - reformat (take 2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 21:17:18 +00:00
David Surovell
5a7d70fe89 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 21:14:34 +00:00
Vadim Zeitlin
0d8c57c006 add comment about using not quite standard mbstowcs() feature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 17:10:32 +00:00
Vadim Zeitlin
dbf9aa465e use our own mbstowcs() and wcstombs() implementations with Metrowerks as MSL CRT doesn't implement Unix98 extension of allowing to call them with NULL output parameters to just get the size of the needed buffer which we rely on
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 16:52:54 +00:00
Stefan Neis
74fd4fd42a Removed creation&deletion of an unused font object.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 16:04:00 +00:00
Stefan Neis
61cc67648d Allow multiple lines for a static text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 16:01:33 +00:00
Vadim Zeitlin
4a6b1d2872 added wx/object.h include (bug 1398517)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 12:54:44 +00:00
Robin Dunn
095315e20d another merge from WX_2_6_BRANCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 07:05:15 +00:00
Robin Dunn
2091f5e71a Allow the frame (if there is one) to resize the toolbar after Realize
is called


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 05:26:22 +00:00
Robin Dunn
e8c1be041f Added wxSizerItem::SetUserData
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 04:46:38 +00:00
David Surovell
d34cca534c cleanup - reformat; added assignment of initial selection to match other platform behavior
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 03:17:29 +00:00
David Surovell
76e36d4334 cleanup - reformat; added (disabled) support for secondary highlight color
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 00:36:37 +00:00
Robin Dunn
b6bc47efde Workaround for wxMac since it is unable to dismiss the edit control
when the listctrl is clicked on.  It has to do with a dependency on
the order of focus events so on wxMac we'll just explicitly dismiss
the edit control if it's active when the listctrl is clicked on.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 23:55:55 +00:00
Mart Raudsepp
a6956d86c7 include wx/event.h, as it is used by-value (parent class).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 23:11:58 +00:00
David Surovell
586031781c cleanup - reformat; minor code tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 19:02:39 +00:00
Stefan Csomor
a319ce7d74 layout adaptions for mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 11:26:07 +00:00
Stefan Csomor
5e02e8e870 transparent grow box for dialogs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 11:24:34 +00:00
David Surovell
04c3457ae3 ported KO's v262 change forward
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 08:46:08 +00:00
David Surovell
c88b7d288c cleanup - reformat (part 3)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 08:38:57 +00:00
Robin Dunn
7dd40b6f4b Added wxGetMouseState which returns the current state of the mouse.
Returns an instance of a wxMouseState object that contains the current
position of the mouse pointer in screen coordinants, as well as
boolean values indicating the up/down status of the mouse buttons and
the modifier keys.  Implemented for wxMSW, wxGTK and wxMac.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 04:31:27 +00:00
Stefan Neis
18a1de69aa Temporarily disabled OS/2 specific code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 01:00:34 +00:00
David Surovell
0207e9693c cleanup - reformat (part 2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-05 00:43:32 +00:00
Stefan Neis
53758b0fc1 Fixed sizing and positioning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 23:27:16 +00:00
Stefan Neis
2240212390 Minor cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 23:05:18 +00:00
Stefan Neis
22c685813c Better default sizes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 22:54:37 +00:00
Stefan Neis
3a339c0dfd Cache slider size in DoSetSize.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 22:49:55 +00:00
Stefan Neis
37ac8a5f21 Fixed label handling (translating for accelerator handling only for relevant
classes)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 22:46:06 +00:00
Stefan Neis
713d144145 Improved size handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 22:37:54 +00:00
Stefan Neis
a917d2149e Fixed sizing and positioning, simplifying code (too much?) in the process.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 22:19:06 +00:00
David Surovell
fef981b4df cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 18:10:31 +00:00
Michael Wetherell
318ac890b6 Fix control and shift key event flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 14:17:53 +00:00
Michael Wetherell
5fe8edce29 Undefine true and false defined in scitech header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 14:14:32 +00:00
Stefan Csomor
f3b2e2d719 remove sizing controls when being in fullscreen mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 11:52:52 +00:00
Stefan Csomor
9761ab4338 increase min size to make all scrollbar controls visible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 11:49:01 +00:00
Stefan Csomor
01b5ab3367 starting blend modes for Core Graphics
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 11:43:45 +00:00
Stefan Csomor
489d2dd393 factoring out Background setter
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 10:34:34 +00:00
David Surovell
6eaa4426e0 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 09:36:36 +00:00
David Surovell
991f71dcc8 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 08:19:13 +00:00
David Surovell
4792d19265 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 05:21:30 +00:00
David Surovell
6eae1f7d48 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 03:14:01 +00:00
Vadim Zeitlin
b10ca83467 Initialize() returns bool, not void
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-04 00:06:13 +00:00
David Surovell
bcb3a16447 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 23:11:20 +00:00
David Surovell
fdd4e6cca8 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 22:06:25 +00:00
Stefan Neis
59fb774d92 Applied patch #1396039 (Notebook tab bitmaps)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 16:52:50 +00:00
Julian Smart
224016a800 Added wxAddGrab, wxRemoveGrab for use by popup window implementations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 16:37:32 +00:00
Stefan Neis
71b4a9b878 Added thread-safe wrappers for get{host,serv}by{name,addr} to replace the
currently still used unsafe versions once possible compilation
        problems are sorted out.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 16:36:20 +00:00
Stefan Neis
be9d986943 Applied patch #1395526 (Autoradiobutton corrections)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 11:49:09 +00:00
Stefan Neis
02d6f1bd31 Fixed bug introduced by previous change (patch #1395852)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 11:08:11 +00:00
David Surovell
7ad25aed02 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-03 04:36:25 +00:00
Vadim Zeitlin
2ad97616eb document that font set with SetFont() is not automatically used by wxPaint/Client/WindowDC associated with the window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36656 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 23:30:06 +00:00
Vadim Zeitlin
04905cca87 GetFont() only works after SetFont()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 23:28:36 +00:00
David Surovell
a0bd314786 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 22:45:50 +00:00
Stefan Neis
ad4e3f7be6 Use system colours
Fixed handling of scrollbar heigh/width


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 21:26:13 +00:00
Michael Wetherell
395936d860 Mention rcdefs.h in changes.txt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 19:42:29 +00:00
Michael Wetherell
c6bb92550b Update changes.txt with recent changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 19:37:12 +00:00
Stefan Neis
a12f464799 Improved support for system colours and scrollbar widths/heights
acoording to patch #1395329.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 19:37:11 +00:00
Robin Dunn
1979aa5872 Added wx.GetColourFromUser and wx.GetFontFromUser
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 19:35:00 +00:00
Robin Dunn
9d7dfdff8c reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36638 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 19:23:18 +00:00
Robin Dunn
943e8dfd02 reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 19:11:14 +00:00
Robin Dunn
7d77854038 Update copyright year
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 19:01:51 +00:00
Stefan Neis
6415637cb0 Choose a legal default font on DC creation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 16:32:12 +00:00
Stefan Neis
42782237f2 Some minor corrections (typos, return value handling).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 16:17:43 +00:00
Michael Wetherell
e90d93d1b4 Add comments about the pango crashes on Solaris 10
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 15:42:24 +00:00
Włodzimierz Skiba
a20169a49a wxpresets adjustement to dmars format.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 15:06:45 +00:00
Julian Smart
b26e7b714d Removed no longer needed code to fix combo sizing (causes layout problems on Windows)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 14:28:37 +00:00
Julian Smart
f14d6dd133 Added caption parameter to wxGetFontFromUser and wxGetColourFromUser.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 14:26:36 +00:00
Jamie Gadd
99c613c5c4 Make radiobuttons siblings instead of children in radioboxes again and remove refresh hack. Fixes bug #1387591.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 11:03:28 +00:00
David Surovell
25eb6881f7 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 02:29:16 +00:00
David Surovell
904ffc03c2 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 02:10:24 +00:00
David Surovell
1d731fcdb9 added runtime protection for no SL_LABEL style case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-02 00:12:55 +00:00
David Surovell
295dec28c3 relaxed ReadGIF error checking as per review
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-01 20:19:13 +00:00
Vadim Zeitlin
80b1853f9e fixed typo in event name (bug 1394834)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-01 18:44:06 +00:00
Vadim Zeitlin
648d8a8720 fixed VC7 unreachable code warning (given even in debug build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-01 01:47:19 +00:00
Vadim Zeitlin
c5a1236296 don't test for __WIN95__ which doesn't exist any more; don't do compiler checks here as they belong to other files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-01 01:42:13 +00:00
Vadim Zeitlin
7889b795ca don't set frame size to maximized one if we're restoring it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-31 19:59:39 +00:00
Stefan Neis
5b52a68426 No obnoxious warnings if threading is disabled.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-31 18:56:32 +00:00
David Surovell
962a48f6f9 fix wxMac-QD - blank focusesed text; minor reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-31 09:19:15 +00:00
David Surovell
6446bbcf31 cleanup - reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-31 01:33:40 +00:00
Robin Dunn
84a17ce686 Merged modifications from the 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 23:11:27 +00:00
Robin Dunn
02b800ce7c Merged modifications from the 2.6 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 23:02:03 +00:00
Robin Dunn
a780a8dc19 wxHotkeyModifier --> wxKeyModifier
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 20:48:57 +00:00
Robin Dunn
53a4b457cf Note that some deprecated items have been removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 20:48:12 +00:00
David Surovell
8523a5f544 minor reformat
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 19:01:34 +00:00
David Surovell
aeaa24d421 two more ReadGIF tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 18:53:40 +00:00
David Surovell
8862315bb9 fixed spelling mistake in comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 18:48:00 +00:00
David Surovell
426195f989 reformatted; added more error checking
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 18:40:20 +00:00
David Surovell
525b0568c9 added protection against corrupted GIFs in ReadGIF
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 18:38:23 +00:00
Michael Wetherell
203b65dd29 The Sun customised version of Pango shipping with Solaris 10 crashes if the
language is left NULL (bug 1374114)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 13:30:08 +00:00
David Surovell
1cb97a5462 cleanup - reformatting (lots), minor code tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-29 22:23:21 +00:00
David Surovell
cefe588637 cleanup - reformatting, minor code tweaks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-29 19:42:43 +00:00
David Surovell
a536a8bf3f fix MinGW/gcc compilation issue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-29 06:43:26 +00:00
Kevin Hock
2a7d0c10c3 Remove obsolete GetForce
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-29 02:01:33 +00:00
Kevin Hock
5bbca8b037 Remove wxConfig object caching (m_config), which solves dangling pointer problem if the global config object changes (and just makes things simpler)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-29 01:49:55 +00:00
David Surovell
61e6a2ab5e fix MinGW/gcc compilation issue
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-28 23:40:21 +00:00
David Surovell
1a70c9e2bf fix SetInvokingWindow link problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-28 23:02:22 +00:00
David Surovell
8a9858aeb2 cleanup - reformatting, minor code rewrites
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-28 06:44:35 +00:00
Vadim Zeitlin
da6205f7fb compilation fix after latest dc.h changes for !WX_PRECOMP case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-27 22:16:05 +00:00
David Surovell
8638e69ba1 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-27 19:50:23 +00:00
Vadim Zeitlin
e72d82bb29 mention wxDC change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-27 15:00:32 +00:00
Stefan Neis
4b2bdce665 Applied Patch #1390457 (Incorrect wxRadioBox widths & heights).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-27 11:20:46 +00:00
Václav Slavík
3c115835b3 added support for <sub> and <sup> to wxHTML (based on patch #1263152)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-27 00:00:39 +00:00
Václav Slavík
43056e6ed5 allow opening .html files, too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-26 23:29:17 +00:00
David Surovell
ea41ff3a56 protect separators against inappropriate state changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-26 18:45:48 +00:00
David Surovell
5977edb9d9 cleanup - reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-26 17:58:27 +00:00
Stefan Neis
ea8ca011a3 Fixed GetIcon to keep up with return type change on all other platforms.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-25 14:37:51 +00:00
Vadim Zeitlin
024026be1d implemented wxDC::DoGetSize() correctly for metafile DC classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-25 13:06:05 +00:00
Vadim Zeitlin
f81dc6e931 Start/EndDrawingOnTop are still used under Motif, don't deprecate them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-25 12:52:53 +00:00
Vadim Zeitlin
7d09b97f53 disallow creation of wxDC objects and made wxDC an ABC; use wxDCTemp instead of wxDC in wx code; fixed WinCE bug with deleting a DC which should be released in wxListBox::MSWOnMeasure()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-25 02:34:42 +00:00
David Surovell
f23d32554f more cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 17:10:36 +00:00
Vadim Zeitlin
8e3e14c487 also generate wxEVT_SCROLL_CHANGED as under wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 02:55:03 +00:00
Vadim Zeitlin
2b0246530d determine the slider event type more precisely (i.e. generate LINE/PAGE UP/DOWN and not only THUMBTRACK always) under GTK2 (bug 1377777); also generate THUMBTRACK/RELEASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36561 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 02:52:25 +00:00
Vadim Zeitlin
d411c5d611 fixed labels under GTK+ 1 after recent changes (remove underscores from them again)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 02:21:00 +00:00
Vadim Zeitlin
defdd88800 GTK+ 1 compilation fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 02:20:15 +00:00
Vadim Zeitlin
76471ff7f5 implemented wxCURSOR_BLANK (bug 1377290)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 02:02:33 +00:00
Vadim Zeitlin
6f86c8af60 warn that GetMenu() may return NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36557 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 01:31:55 +00:00
Vadim Zeitlin
43a11e2a50 moded wxWindow::PopupMenu() from window.cpp to menu.cpp as this allows it to access static functions in menu.cpp; implemented sending of wxEVT_MENU_OPEN/CLOSE for popup menus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 01:29:08 +00:00
Vadim Zeitlin
13d3511257 send wxEVT_MENU_CLOSE from menubar deactivate handler, this ensures that the event is sent even when the menu is dismissed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36555 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 01:21:27 +00:00
Vadim Zeitlin
cdf003d465 send wxEVT_MENU_CLOSE at least sometimes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 00:44:57 +00:00
Vadim Zeitlin
4626c57c58 1. changed wxStringTokenizer to not modify the string we're iterating over
but to just update our position in it (makes the code much more clear)
2. added GetLastDelimiter() to make up for lack of mode combining
   wxTOKEN_RET_EMPTY_ALL and RET_DELIMS
3. documented it and added unit tests for it


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36552 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 00:12:54 +00:00
Vadim Zeitlin
505a8c2ced added a couple more wxTOKEN_RET_DELIMS tests
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-24 00:01:11 +00:00
Vadim Zeitlin
8aa57160a0 even more test cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 23:54:50 +00:00
Vadim Zeitlin
822c2b9f65 corrected expected test results to conform to current wxTOKEN_RET_EMPTY behaviour; added the value of loop index for which the test fails to the diagnostic messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 23:38:22 +00:00
Vadim Zeitlin
2461117002 more test cases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 23:27:25 +00:00
Jouk Jansen
39b7aa3f5e Committing in .
configuration update for OpenVMS

 Modified Files:
 	wxWidgets/setup.h_vms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36542 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 07:42:38 +00:00
David Surovell
ec4a2b5df2 more cleanup - added comment regarding possible stipple brush problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36541 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 05:16:45 +00:00
Vadim Zeitlin
dfc69c6d5b corrected handling of timeouts in wxConditionInternal::WaitTimeout(): check for wxSEMA_TIMEOUT, not wxSEMA_BUSY; return wxCOND_TIMEOUT, not wxCOND_MISC_ERROR (bug 1387179)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36540 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 01:20:38 +00:00
Vadim Zeitlin
98cb8dcb0c don't set minimal column width, it should be possible to set it even to 0 if desired (e.g. to hide a column)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36539 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 01:00:30 +00:00
Vadim Zeitlin
d241d258cf correct dll export declaration for wxVolume
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 00:59:29 +00:00
Vadim Zeitlin
1440bc7afa added wxRTTI macros to wxControlWithItems: it's not private any longer
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36536 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-23 00:58:32 +00:00
Robin Dunn
ac9251e323 Fix for bug #1266745 and #1387725 in the wxFindReplaceDialog on MSW.
Actually check we are using MSLU before doing the hack designed to
workaround a bug in MSLU!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 23:33:08 +00:00
Václav Slavík
5aad18a52b reverted previous accidental commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36531 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 23:11:36 +00:00
Václav Slavík
48e5284db6 wxMac linking fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 23:04:05 +00:00
Kevin Ollivier
2f91e3dfd2 Fixes so that wxPython builds on 2.7. Mostly removing references to all functions that require WXWIN_2_4_COMPATIBILITY to be defined.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36527 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 06:57:46 +00:00
Kevin Ollivier
c1ebcef04d Use the now 'official' makemo.py when building packages.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 06:09:26 +00:00
Kevin Ollivier
fbc661d006 Updating version.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36525 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 05:55:50 +00:00
Kevin Ollivier
5e66e38e9f Moving the 2.6 branch change in how SWIG is found to CVS HEAD now that Robin's build system uses it too.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36524 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 03:24:47 +00:00
Vadim Zeitlin
bdcb882076 added wxListAttr::AssignFrom()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 03:10:35 +00:00
Vadim Zeitlin
0f3888a5f8 don't overwrite the existing attributes when setting one new one, i.e. SetItemBackgroundColour() after SetItemTextColour() doesn't reset the text colour to default one any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 03:07:48 +00:00
Vadim Zeitlin
5421785005 update from liou xiao <liouxiao@hotmail.com>
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 02:41:53 +00:00
David Surovell
c394a432fa fixed error in prior checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 01:14:06 +00:00
Vadim Zeitlin
53599fbbd8 Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 00:17:22 +00:00
Vadim Zeitlin
20a34d96ef regenerated makefiles after adding tokenizer.cpp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36517 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-22 00:11:26 +00:00
Robin Dunn
fa31aeda87 After a conversaion with Vadim I reverted the last change and instead
just allowed for the specific situation that was incorrectly causing
the assert.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 20:51:14 +00:00
Robin Dunn
d2be15217a Fix for Bug #1387359, bail out early from DoWriteText if the string is empty.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36515 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 20:19:14 +00:00
David Surovell
fbc1d11bde minor cleanup; remove focus patch scaffolding
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36514 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 19:54:48 +00:00
Vadim Zeitlin
fe224552a9 g++ 4/wxMAC_USE_CORE_GRAPHICS warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 16:12:48 +00:00
Vadim Zeitlin
6c28639791 just added a comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36512 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 16:11:58 +00:00
Vadim Zeitlin
423d529ccb compilation test for Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-21 01:23:17 +00:00
Dimitri Schoolwerth
6f72133189 fixed compile errors (code was using unnamed objects, resulting in compiler ambiguity)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:52:36 +00:00
Vadim Zeitlin
421274fade added tests showing that current wxStringTokenizer code doesn't handle multiple delimiters at the end of string properly in mode != wxTOKEN_STRTOK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36507 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:48:41 +00:00
Vadim Zeitlin
8b6d5b1fc3 extracted wxStringTokenizer tests in their own file and rewrote them to be table based and more clear (separated strtok()-compatibility test from the other one)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36506 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:34:09 +00:00
Vadim Zeitlin
a67f601b14 extracted wxStringTokenizer tests in their own file and rewrote them to be table based and more clear (separated strtok()-compatibility test from the other one)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36505 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 16:30:12 +00:00
Vadim Zeitlin
80ca48ebc6 update from Wei-Lun Chao
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36503 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 14:40:18 +00:00
Dimitri Schoolwerth
769627d79e fixed unreachable code warnings (occurred in MSVC6+Release mode)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36502 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 14:25:36 +00:00
Kevin Ollivier
acb4c4bdb0 Remove references to now removed iewin module. Replaced by activex/wxie.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 05:44:51 +00:00
Kevin Ollivier
4136a15d56 Removing old iewin extension. Replaced by activex/wxie.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 05:37:59 +00:00
Vadim Zeitlin
f3c49b55b0 added newline at end of file (avoids gcc warning when building with Xcode 2.2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36496 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-20 01:47:09 +00:00
Julian Smart
398c701f70 Fixed problem trying to print from a preview, whereby wrong printer
class was used instead of Gnome printer class.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 20:38:47 +00:00
Vadim Zeitlin
0b6d76bfd4 don't crash when XIM is used under IRIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 16:06:31 +00:00
Vadim Zeitlin
c8a448977c removed DllMain(): we don't even compile it with any compiler but VC8 and with VC8 it results in a crash; we need another way to make it possible to use wx DLL from another DLL, this one is flawed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 14:34:12 +00:00
Vadim Zeitlin
a44fb285c5 documented Set/GetIcon(), added (not quite pure) virtual GetIcon() in the base class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 13:56:23 +00:00
Vadim Zeitlin
333c869716 return a valid bitmap from GetBitmap() even if we created an icon internally
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 13:46:23 +00:00
Julian Smart
62bdd4db0e wxMac changes documented.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 12:04:11 +00:00
Włodzimierz Skiba
9d8b1d2f3e Somebody forgot to restore from testing phase.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 11:09:19 +00:00
Włodzimierz Skiba
1ed6437807 __WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:55:11 +00:00
Włodzimierz Skiba
a71d815bbe __WIN95__ removed (used to differ win3.1 vs. 'modern' 95 look, nowadays always defined for WXMSW so useless). Minor cleanings and corrections for correct #includes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:47:44 +00:00
Vadim Zeitlin
634fb75048 fix for compilation without PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 10:03:04 +00:00
David Surovell
18f5234f0c removed unused local variable; converted tabs to spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36452 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 03:51:34 +00:00
Kevin Ollivier
39fc328f03 Use TranslateAccelerator so that TAB, Return, etc. keys are properly processed by wxActiveX controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36451 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 01:42:32 +00:00
Kevin Ollivier
89c8318014 Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX controls)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 01:39:54 +00:00
Mart Raudsepp
b19d928925 timer.tex: wxTimerEvent is derived from wxEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-19 00:34:13 +00:00
Vadim Zeitlin
cba1c2ca12 assert if opening more than one find/replace dialog under the same parent -- this doesn't work currently (and maybe can't work at all)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 22:33:35 +00:00
Stefan Neis
cf44a61c24 Added implementation for wxLocaltime_r/wxGmtime_r.
Improved handling of windows compilers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 19:24:11 +00:00
Vadim Zeitlin
f107837e78 documented Set/GetLabel() treatment of mnemonics
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:39:18 +00:00
Vadim Zeitlin
b2ff89d648 1. changed wxControl::GetLabel() to return the originally provided label and
not the one stripped from mnemonics (this was inconsistent with the other
   ports and resulted in problems when using wxUpdateUIEvent::SetText())
2. added wxControl::GTKConvertMnemonics(), GTKRemoveMnemonics() and also
   helper GTKSetLabelForLabel() and GTKSetLabelForFrame() wrappers
3. use them instead of duplicating their code in different derived controls


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:37:56 +00:00
Vadim Zeitlin
d1d40c2176 removed GetLabel() which didn't do anything but forwarding to wxControl version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36434 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:34:17 +00:00
Vadim Zeitlin
33d5c15653 blatant compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36433 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 16:03:26 +00:00
Vadim Zeitlin
8dfd4fade8 code cleanup: make OutputString[Ent]() simpler to call by providing defaults for conversion parameters and using flag instead of a bool
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36432 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 15:02:01 +00:00
Vadim Zeitlin
24c80a284c use correct encoding when saving in non-Unicode builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36430 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 14:49:38 +00:00
Michael Wetherell
716e748b2f In the past some streams returned Eof() before the end was read past rather
after, and also some streams give an error instead of Eof(). Test the archive
streams work with parent streams that have any of these behaviours.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 13:58:55 +00:00
Michael Wetherell
abffc1ff5d Changes to cope with parent streams which return an error instead of eof at the
end of the file.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 13:51:24 +00:00
Julian Smart
b71e9aa4e2 Separated XML and HTML rich text I/O handlers
Cleaned up XML I/O
Added HTML handler to build system
Added encoding member for saving files output


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:31:07 +00:00
Julian Smart
63886f6d98 Fixed bug introduced by compiler compatibility fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:25:21 +00:00
Julian Smart
9dbadebe92 Should use LoadFile for file, not LoadPage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36425 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:24:25 +00:00
Julian Smart
3d941982de Added space after list item number, otherwise number is hard against following text.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36424 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 12:22:20 +00:00
Michael Wetherell
9cbac6d19d Put back the warning flags
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-18 11:37:50 +00:00
Stefan Neis
a452689b23 Use thread-safe functions where possible.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36418 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-17 22:01:43 +00:00
Vadim Zeitlin
120edd5dbd use just SetSizerAndFit instead of 4 equivalent lines
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36417 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-17 19:23:04 +00:00
Vadim Zeitlin
143e2719f5 corrected DoGetVirtualSize() to return at least our real size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36416 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-17 19:19:45 +00:00
Kevin Ollivier
9347ef2f59 Script for building mo locale files.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-16 17:37:05 +00:00
Julian Smart
7dbe942aaa Fixed MDI context menu event handling problem (Stefan Kowski)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36407 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-16 14:52:57 +00:00
Ron Lee
8bdc493773 Sync changes from Debian 2.6 tree.
Fixes #324960, enabling config.py to handle in tree builds without
tainting build_options.py used for (later) install to some other
location.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-16 02:12:16 +00:00
Kevin Ollivier
1d7127d0cf Forward port 2.6 branch changes to head.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-16 01:38:48 +00:00
Mart Raudsepp
7261746aae image.tex: s/set.to/set to
function.tex: fix Vadim's label for wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-16 00:37:30 +00:00
David Surovell
eb1a7cf93d fixed bug introduced in prior check-ins; minor reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36402 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-15 21:21:02 +00:00
Chris Elliott
e795e8b56f fix Borland bug http://news.gmane.org/find-root.php?message_id=%3c43A0B07F.8010204%40as.ro%3e
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36399 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-15 15:07:36 +00:00
David Surovell
898d9035fb more reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36398 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-15 08:55:15 +00:00
David Surovell
b21d67a04d even more reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-15 00:58:39 +00:00
Dimitri Schoolwerth
35853cf203 fixed compilo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36396 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-15 00:25:03 +00:00
David Surovell
9b2eab527d reformat for readability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 23:20:55 +00:00
David Surovell
21e77aa170 simplified ::Show
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 23:12:32 +00:00
Vadim Zeitlin
57d5314e67 update from Janos Vegh
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 21:48:46 +00:00
Vadim Zeitlin
9fe0c2fcf7 fixed return code checking in wxImageList::Replace() (bug 1380664)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36391 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 18:56:15 +00:00
David Surovell
d8746da256 removed patch 1373127
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36390 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 17:49:05 +00:00
Michael Wetherell
1fbfc5edf6 Compile Fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 17:03:47 +00:00
Vadim Zeitlin
c46c1fb868 code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 14:08:19 +00:00
Vadim Zeitlin
f697241630 compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 13:55:19 +00:00
Julian Smart
e8615999dd Fixed wxFileDialog breakage on WinCE due to incorrect structure size, and
added correct error testing for WinCE.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36386 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 11:20:09 +00:00
Vadim Zeitlin
1fc8cfbd81 friend declarations are not injected in the enclosing scope by conforming compilers such as g++ 4, so fix compilation by always providing real declarations for operator+(wxString,anything)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 01:55:48 +00:00
Vadim Zeitlin
d1e1aa64cc removed obsolete reference to wxScrolledWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-14 01:45:03 +00:00
David Surovell
98e04c1376 fixed obscure compilation problem at line 139
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 23:15:42 +00:00
David Surovell
a979e444a3 more reformatting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36381 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 21:27:49 +00:00
Chris Elliott
8792cb7340 fix bug sf [ 1327872 ] Borland and mslu.cpp problem
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36380 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 13:43:52 +00:00
David Surovell
98af9c7383 reformat for readability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 05:13:55 +00:00
Mart Raudsepp
b16de7461a Remove my binary compatibility stuff from HEAD. Patch #1367014 used for reference.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36378 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 02:46:20 +00:00
Mart Raudsepp
8180d40b1f Typo fixes in comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36377 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 02:30:18 +00:00
Mart Raudsepp
f660b2062c Fix HitTest to return the proper tab index in case there are more tabs than fit (and therefore there are scrolling
arrows), and the first visible tab isn't the first real tab. Before counting started from the visible tab, not real
tab.
While doing this, I noticed lots of "interesting" bugs wrt tab indexes and the whole wxGtkNotebookPage hack in the
code. In my opinion, to fix some of the bugs I noticed during testing, wxGtkNotebookPage has to be nuked and the
necessary parts rewritten.
Meanwhile, the HitTest fix works with wxNB_TOP styled notebooks that haven't modified tabs in a way that would have
mess up the wxGtkNotebookPage index sync. For other cases it might depend on the phase of the moon, and other factors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36376 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 01:20:41 +00:00
David Surovell
52c3df9930 reformat for readability
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36375 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-13 00:59:19 +00:00
Vadim Zeitlin
761598d4e5 fixed handling of dst offset in wxAlphaBlend()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-12 11:15:23 +00:00
Włodzimierz Skiba
f61b709751 Regenerated makefile after wxOS2 display support and new splash sample file.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-12 07:58:08 +00:00
Włodzimierz Skiba
4ecb9c74bf Improved small screen splash sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-11 17:34:29 +00:00
Włodzimierz Skiba
58ed4361e9 Improved small screen splash sample.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36368 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-11 16:16:03 +00:00
Włodzimierz Skiba
b706528b9e wxUSE_DISPLAY impossible with eVC3 (SDKs 2002).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36367 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-11 16:11:15 +00:00
Stefan Neis
fe1f34f82e Fixed wxDirExists implementation for OS/2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36366 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-11 15:25:02 +00:00
Stefan Csomor
65785aa966 activate SetFocus patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 16:59:19 +00:00
Stefan Csomor
ead6269ac0 support for standard menu ids
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36364 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 15:50:20 +00:00
Stefan Csomor
ccf1ef0f10 support for default key handling (escape,enter,command-period) even if there is no control on the frame/dialog, that has the focus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36363 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 15:47:42 +00:00
Stefan Csomor
ca71e3ae27 support for standard command IDs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36362 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 15:36:09 +00:00
Stefan Csomor
1628261e2b support for standard command IDs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 15:24:55 +00:00
Włodzimierz Skiba
2ad495fb65 wxDisplay support for wxWinCE port.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 14:40:26 +00:00
Stefan Csomor
53a410d1b2 add reasonable default TEMP for __WXMAC__ when running under __DARWIN__
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36359 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 13:18:18 +00:00
Stefan Csomor
8c8f6a4b1d default to simple show/hide tlw on OSX instead of transitions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 13:08:54 +00:00
Stefan Neis
ac19bdce14 Added OS/2's wxDisplay implementation to list of files to be compiled.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 11:05:44 +00:00
George Tasker
ae2807c2e6 DB2 databases were mistakenly reporting that they were dBase databases
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 00:37:05 +00:00
George Tasker
90e7e2775f Updated to state INNER join rather than OUTER join
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-10 00:28:16 +00:00
David Surovell
e15f0a5ea3 reformat for readability; more prep. for patch 1376506
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-09 20:43:49 +00:00
Vadim Zeitlin
dd9d938f5c added msw/ole subdirectories
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36353 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-09 16:24:47 +00:00
David Surovell
dac390e90b cleanup in preparation for patch 1376506
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-09 16:18:01 +00:00
Václav Slavík
04f109ec63 made wxHtmlWindow::SetPage virtual so that the behaviour can be customized
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-09 12:34:29 +00:00
David Surovell
75f0a06e5f format cleanup; some new comments; minor optimizations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-09 00:10:27 +00:00
Julian Smart
789e2d57b8 Use ~/Application Support folder on Mac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-08 21:49:52 +00:00
David Surovell
739b752912 applied patch 1376506 - remove unneeded member variable from GTK wxRadioButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36348 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-08 21:44:46 +00:00
Stefan Neis
dc8fbc37b0 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-07 09:35:38 +00:00
Julian Smart
aea25ac560 Initialize values (uninitialized variables reported to cause problems on WinME)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36346 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-06 19:07:28 +00:00
David Surovell
ddfcd9aae4 fix binary math in alignment flag assignment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-06 16:34:30 +00:00
Vadim Zeitlin
6ffc9aa8a4 fixed typo in previous commit which, instead of fixing the bug in wxSizerflags::Align(), made it worse
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-06 12:33:24 +00:00
David Surovell
bafd830636 applied patch 1373127
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-05 16:25:16 +00:00
David Surovell
f9f9c8fcf9 applied Paul Cornett's suggested changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36342 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-05 01:07:22 +00:00
Vadim Zeitlin
d5437b854c fixed broken code using readlink(): please don't just cast wxChar * to char *, this doesn't risk to ever work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36341 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-04 13:01:50 +00:00
David Surovell
30efba0a9a applied patch 1372567, with some minor mods and cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36340 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-04 07:54:19 +00:00
David Surovell
ca7d651d5d fixed compilation bug in prior checkin (Pt. 2)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36339 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-04 05:00:26 +00:00
David Surovell
9238471679 fixed compilation bug in prior checkin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-04 01:04:02 +00:00
David Surovell
74ebd40690 fix for bug 1371386, with some minor mods and cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36337 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-03 21:17:17 +00:00
David Surovell
d806d30a0f applied patch 1372197, with some minor mods and cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-03 17:55:33 +00:00
Vadim Zeitlin
f2be55804a corrected wxCHECK messages
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36335 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-03 12:47:55 +00:00
Stefan Csomor
d281db8b42 avoiding unkown namespace std
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-03 08:43:31 +00:00
Stefan Csomor
abb4f9c937 correcting CGImage handling to be always correctly initialized and freed on OSX builds, even when not using CoreGraphics, Ryan's Patch 1372209
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-03 07:58:16 +00:00
Jouk Jansen
1c5e12589c Committing in .
OpenVMS compile updates

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/src/common/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36331 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-02 08:52:09 +00:00
Vadim Zeitlin
5875d39c9b fixed problems with sometimes processing the events twice introduced in rev 1.170 but still don't leak memory (Tim Kosse)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-02 00:53:31 +00:00
David Surovell
17cfea0162 minor cleanup, part 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36329 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-01 23:32:47 +00:00
David Surovell
97071cdbff minor cleanup: corrected typos, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36328 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-01 23:20:30 +00:00
Michael Wetherell
7c6c0acf9d Silence warning from bcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-01 14:30:30 +00:00
David Surovell
1aa7b427f2 minor cleanup: corrected typos, etc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-01 14:28:30 +00:00
Václav Slavík
5996fb421d fixed wxComboBox::Clear to clear stored value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-01 12:55:34 +00:00
Włodzimierz Skiba
8ecd5de227 [ 1357527 ] Cast to void to silence GCC's warnings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36324 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-01 11:05:31 +00:00
Michael Wetherell
b974b0da43 Let TARGET_CPU work with either upper or lower case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 20:13:48 +00:00
David Surovell
80050aa167 corrected comment typos
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36316 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 19:34:43 +00:00
David Surovell
a8d2fb31cb readability cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 18:30:49 +00:00
David Surovell
ec7a8d0256 added missing #endif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36314 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 17:45:05 +00:00
Vadim Zeitlin
066a357890 IsItemShown/Enabled() are now implemented on more platforms than just wxMSW
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36313 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 17:29:10 +00:00
Vadim Zeitlin
1661354b77 implemented IsItemEnabled/Shown()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36312 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 17:28:18 +00:00
Vadim Zeitlin
c92ad09968 put user-specified CPP/C/CXXFLAGS after the ones we set from configure to allow overriding them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 17:24:35 +00:00
Vadim Zeitlin
27c78e4552 1. derive wxGTK wxRadioBox from wxRadioBoxBase now, as in all other ports
2. implemented wxRadioBox::IsItemShown/Enabled() for wxGTK


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36310 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 16:39:23 +00:00
Vadim Zeitlin
f3984afa30 Set major dim after the items have been created
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36309 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 16:33:43 +00:00
Vadim Zeitlin
b47f1f95f3 added wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING macro
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36308 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 16:31:19 +00:00
Vadim Zeitlin
21e0a4d5f1 1. moved m_majorDim duplicated in many ports to wxRadioBoxBase
2. also implement Getcolumn/RowCount() in it now and document them
3. removed various remains of old (pre-wxRadioBoxBase) cruft

sorry in advance for any compilation breakage on the platforms I can't test on


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 16:28:15 +00:00
Vadim Zeitlin
344d0d8821 suppress gcc warnings about class having private dtor and no friends
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 15:35:04 +00:00
Vadim Zeitlin
dc7a2021d5 corrected GetChildren() docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36305 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 15:27:46 +00:00
Vadim Zeitlin
b03cd7e68f added test for wxString::Format() string truncation for longer strings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 14:50:54 +00:00
Vadim Zeitlin
de2589be08 avoid multiple reallocations in wxString::PrintfV() if vsnprintf() returns the total required size
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 14:49:47 +00:00
Vadim Zeitlin
42413abf11 removed sentence about ParseDateTime() not being implemented
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 13:32:14 +00:00
Michael Wetherell
7ab86a6a27 Make behaviour of Eof() more consistent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 13:14:00 +00:00
Michael Wetherell
8e50d1add6 Make Eof() consistent with other streams
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 12:41:48 +00:00
David Surovell
4d53859584 minor refactoring of menu UpdateUI handling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36296 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 07:59:38 +00:00
Włodzimierz Skiba
0b04c4e0bd Missing wxUSE_PALETTE markup (#1369489).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36295 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 07:58:37 +00:00
Włodzimierz Skiba
7e04489676 Missing wxUSE_JOYSTICK markup (#1369478).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 07:43:06 +00:00
Ron Lee
a55d039a23 Output deprecated warning for --rezflags and permanently disable it.
Remove WXCONFIG_POSTLINK_COMMAND that existed only for it.
Make the explanation more explanatory.  This is not an invitation
for stray options and script helpers to do a little 'open mike',
its a holding ground for nasty things we still need to fix.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36293 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 06:36:05 +00:00
Vadim Zeitlin
a815cb29f2 removed (now) unnecessary errno.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-30 02:42:39 +00:00
Vadim Zeitlin
00dc67b891 fixed bug in wxSizerFlags::Align/Expand() methods
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36291 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 23:05:50 +00:00
Vadim Zeitlin
b1727cfef7 don't expect errno to be set to EOVERFLOW if vsnprintf() fails
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 22:59:02 +00:00
Vadim Zeitlin
455c8f1d55 don't clip out hidden radiobox buttons: otherwise they're displayed incorrectly when themes are in use
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36289 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 22:10:04 +00:00
Vadim Zeitlin
3bfa7be977 added wxRadioBox::IsItemEnabled/Shown() (for MSW only for now, other platforms to come); corrected Enable/Show() return values
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36288 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 19:26:38 +00:00
Michael Wetherell
2f1834d9f2 Remove pragma interface
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 17:48:10 +00:00
David Surovell
8cd9896942 cleaned up comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36286 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 17:41:06 +00:00
Michael Wetherell
bf085665fd It seems that wxFileInput/OutputStream now report eof after the last byte has
been read past, so change docs to match.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36285 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 14:09:01 +00:00
Mart Raudsepp
da9e956384 Make wxJoystick::GetNumberJoystick a static method, as the number of
joysticks attached to the computer is a global property, not one of the
specific instance. Patch from Lauri Nurmi.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36284 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 12:50:13 +00:00
Julian Smart
b377eda09d Removed duplicate xh_grid.cpp/h and rebaked files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 09:03:35 +00:00
Julian Smart
3f97aec58a Made explanation more concise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36282 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 08:57:05 +00:00
Ron Lee
004ee6daa7 Fix include dirs for windres, enable emxbind to actually produce output,
restore RESCOMP for backward compatibility and forward availability.
Check for windres again.  Whatever bakefiles do with it, they do not
make it available to configure.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 05:17:05 +00:00
Vadim Zeitlin
dbcca2fa1f added xrc/xh_grid.{h|cpp} and regenerated makefiles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36280 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 01:19:22 +00:00
Vadim Zeitlin
8c17c7a633 define REZ option (fixes problem with rebaking wx.bkl for autoconf format)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 01:17:18 +00:00
Vadim Zeitlin
f5e3d9463b guard grid XRC handler by #if wxUSE_GRID
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36278 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-29 00:54:02 +00:00
David Surovell
7ec81a8c2d fixed improper (long) casts
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-28 22:24:00 +00:00
David Surovell
a8cb1a4947 changed background color reference from light gray to assigned bkgd color
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-28 15:27:09 +00:00
Vadim Zeitlin
4292eeb4eb fix unused parameter warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-28 00:19:38 +00:00
Stefan Neis
8a064d5cef Cleaned up some erroneous stuff from previous commit, added HAVE_GETADDRINFO
to setup.h.in.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36274 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 21:42:51 +00:00
Stefan Neis
c5f975dddb Applied patch #1198422 (CheckBox labels being truncated).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 21:30:40 +00:00
Michael Wetherell
9630cac5fc Take out wxASSERTs since they give a warning with gcc.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36271 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 18:12:37 +00:00
Michael Wetherell
24c96d96bc wx_wcscmp is only used in unicode mode so wrap in #if wxUSE_UNICODE to avoid
a warning about an unused function, and clean up the function at the same time.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 18:04:06 +00:00
Michael Wetherell
f489770c10 Do CloseEntry internally when OpenEntry called on an already open stream.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36269 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 17:55:00 +00:00
Stefan Neis
bebf40d5a0 Detect thread-safe versions of gethostbyname/gethostbyaddr/getservbyname
and how many arguments they use.
Detect thread-safe versions of localtime/gmtime and readdir.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36267 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 17:46:39 +00:00
Vadim Zeitlin
b21348b405 don't compare bools with NULL
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 14:03:36 +00:00
Michael Wetherell
9b70ed7b55 Small fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36263 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 09:29:46 +00:00
Michael Wetherell
4c9847e14e Small fixes to allow compilation with --enable-stl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36260 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 02:03:40 +00:00
Michael Wetherell
b271d60d6a Small fixes to allow compilation in Unicode mode with gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 02:01:21 +00:00
Michael Wetherell
548bbe143b Replace non-ascii characters with escapes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36258 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 01:58:19 +00:00
Michael Wetherell
c1d8296a78 Silence warning about truncation since the comment says it ok
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36257 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-27 01:56:51 +00:00
David Surovell
e88df737fb fixed GetFreeMemory decl. to match wxWidgets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36256 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-26 23:27:21 +00:00
Vadim Zeitlin
8aeeb05c0e renaming of variables in rev 1.1090 introduced a clash between 2 different DEBUG_FLAG variables, so renamed the one containing debugging options for the compiler to DEBUG_CFLAGS to avoid it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-26 15:42:12 +00:00
Vadim Zeitlin
4ad76303b5 include missing header; add default values for wxPlotWindow ctor pos and size parameters for consistency with all the other wx classes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36254 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-26 14:40:32 +00:00
Michael Wetherell
8875e7ad84 Only define wxIntegerHash::longlongHash when long long isn't long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-26 13:40:54 +00:00
Vadim Zeitlin
dddd1f21c1 added helper for visual sizers debugging
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36252 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-26 13:09:23 +00:00
Vadim Zeitlin
cc11ded1ae made wxTreeTraversal and wxIDropSources dtors virtual (patch 1311828)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-26 13:08:09 +00:00
Vadim Zeitlin
9ad34f611f implemented wxGetFreeMemory() under IRIX (patch 1360356); made wxMemorySize always 64 bit as it can overflow even in 32 bit builds otherwise
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 22:09:22 +00:00
Vadim Zeitlin
2cdf244521 fix warnings about casting regmatch_t struct fields to size_t
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36249 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 21:49:00 +00:00
David Elliott
8ced02f601 Ran make -f build/autogen.mk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 05:17:36 +00:00
David Elliott
891ace0538 Separate RESCOMP into WINDRES (for Win32) and REZ (for Mac OS).
Don't check for windres as bakefile.m4 now does it properly.
Rename MACRESCOMP to POSTLINK_COMMAND.
Rename MACRESWXCONFIG to WXCONFIG_POSTLINK_COMMAND.
Use newest bakefile.m4 (with similar changes).
Add --rezflags option back to wx-config so existing user Makefiles don't break.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36247 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-25 04:51:08 +00:00
Włodzimierz Skiba
9cd03a43ce Minor improvements and cleanings after recent WinCE fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36245 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 20:16:31 +00:00
Julian Smart
7532f691fb Applied patch [ 1310251 ] Fixed a pixel depth bug converting wxImageb to wxBitmap
By Mike Fahl


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 17:41:26 +00:00
Julian Smart
38c39207e9 Fixed style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36243 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 17:31:35 +00:00
Julian Smart
0e3c83a736 Applied patch [ 1308152 ] wxGrid XRC handler patch HEAD
Start of a wxGrid handler by Agron Selimaj
Applied with corrections. Needs further work for retrieving grid properties
and styles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 17:26:05 +00:00
Julian Smart
650372cf91 Applied patch [ 1305650 ] ODBC32.lib is not included for borland by wxpresets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 17:09:43 +00:00
Julian Smart
6e9e2d94b4 Applied patch [ 1351847 ] wxTextXtrl Undo/Redo Bug (sic)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 16:53:48 +00:00
Julian Smart
78c743d864 Applied patch [ 1357475 ] WinCE : wxExecute does not execute programs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-24 16:45:05 +00:00
Włodzimierz Skiba
63de3718ed [ 1364397 ] wxUSE_MS_HTML_HELP could be redefined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36237 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 13:57:56 +00:00
Michael Wetherell
7553e636a2 Add 'wx_' prefix to builtin regfree and regerror
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 13:56:08 +00:00
Włodzimierz Skiba
66d84d1130 Build and run ::wxGetUserName() silently with unusual configs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36233 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 12:04:42 +00:00
Vadim Zeitlin
3d971ca9f1 fixed Write() signature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36232 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 10:29:37 +00:00
David Surovell
bb86baea10 Realize remap code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 08:01:47 +00:00
Ron Lee
370d2fd7cc Minimal implementation of --rescomp option for wx-config,
required for building windows resource files.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36230 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 05:10:09 +00:00
Vadim Zeitlin
bc6ee4ae7f fixed quoting in CPPFLAGS (last change broke the Unix build)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36229 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-23 02:10:04 +00:00
Stefan Csomor
0df4335d4d using backward compatible calls for HitTest hack
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 17:54:16 +00:00
David Surovell
2c62259349 fixed memory leak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 16:15:46 +00:00
David Surovell
0c38974967 added wxMac comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36226 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 16:11:59 +00:00
Włodzimierz Skiba
86f6a6d19d Safe wxStrncpy usage.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36225 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 11:57:55 +00:00
Włodzimierz Skiba
717870a64c wxGetUserName for WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 10:01:20 +00:00
Włodzimierz Skiba
119f7bb745 wxGetUserName for WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36221 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 09:20:41 +00:00
Vadim Zeitlin
5ff751d600 autumn cleanup of configure:
1. we now consistently use WXCONFIG_C[PP|XX]_FLAGS instead of a mix of CODE_GEN_FLAGS
   plus tons of ad hoc variables (TOOLCHAIN_DEFS, WX_LARGEFILE_FLAGS, WXDEBUG_DEFINE
   and so on) which could all be simply removed now

2. output more stuff which used to be in CFLAGS only in wx-config output:
 a) pthread options (they are needed for user code compilation too)
 b) -D__STDC__EXT needed under HP-UX, this should finally fix the build there

3. also removed GCC_PRAGMA_FLAGS which is unused any more

4. use consitent naming for a couple of other variables


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-22 02:06:16 +00:00
David Surovell
4647fc0833 removed empty block
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-21 21:42:58 +00:00
Vadim Zeitlin
aae53500af removed non-const wxFontData::GetColour()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-21 21:28:40 +00:00
Vadim Zeitlin
50a32a83d7 documented HasFlag()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36217 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-21 19:41:17 +00:00
Dimitri Schoolwerth
412e0d47c0 applied patch #1356901 "Yet another removal of extra semicolons", also fixed remaining similar cases of extra semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36216 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 21:55:35 +00:00
Vadim Zeitlin
84ac8772b7 return correct error message if NSLinkModule() fails; fixed flagrant buffer overflow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 21:26:34 +00:00
Vadim Zeitlin
67d0bba631 we have dlerror() under Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 21:23:53 +00:00
Vadim Zeitlin
233c6e7fb0 script to set the install name correctly for all wx libraries from the given install prefix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36213 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 18:11:44 +00:00
Michael Wetherell
ab0f0eddc4 Use re_search directly instead of regexec when using the GNU regex lib
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 17:25:33 +00:00
Julian Smart
7ede73899d Moved EnsureVisible to avoid spurious selection of root during idle processing
(via ScrollTo/wxYieldIfNeeded)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36210 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 15:27:11 +00:00
Julian Smart
1599f54eaa Typo corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36209 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 15:22:17 +00:00
Vadim Zeitlin
46bed958ef don't cast from float to int (provoking a warning) just to cast back to float again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36208 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 15:19:12 +00:00
Vadim Zeitlin
f885b81573 fixed harmless signed/unsigned comparison warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36207 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 15:18:07 +00:00
Vadim Zeitlin
69d313011b corrected SeekEnd() docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36206 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-20 14:26:50 +00:00
Julian Smart
9941146580 Event coordinates should _always_ be physical, not logical, to
be consistent both with other events and with the wxMSW control


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-19 22:49:13 +00:00
Stefan Csomor
21ec3bf99c patch 1352744
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36201 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-19 13:05:14 +00:00
Mart Raudsepp
90e572f1e5 Spelling fixes from Andreas Mohr (patch #1360064)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36199 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-19 01:07:56 +00:00
Stefan Csomor
8b28584104 patch 1306473
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36198 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-18 21:23:24 +00:00
Stefan Csomor
7db33dd7ad patch 1265473
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-18 18:40:34 +00:00
Włodzimierz Skiba
0ab48d6405 Follow other ports with Title/Label split.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-18 18:34:15 +00:00
Włodzimierz Skiba
f0f60c7c21 Update after adding palmos setup.h to family of automatically created setups.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36195 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-18 18:30:26 +00:00
Václav Slavík
3bc7a423ad fixed layout of tables that are first element on a page
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36194 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-17 23:37:27 +00:00
Václav Slavík
97eac136f3 reduced code duplication in wxHtmlWinParser::AddText (no real change)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-17 23:35:36 +00:00
Julian Smart
46cbb21ecb Fixed problem with choice editor in wxGrid whereby the editor
lost focus when the combobox menu was shown.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36192 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-17 17:43:15 +00:00
Włodzimierz Skiba
1ac74d83a3 Fixes for bugs #1218219 and #1218254.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-17 14:36:32 +00:00
Włodzimierz Skiba
8b0df0e138 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36190 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-16 17:43:52 +00:00
Włodzimierz Skiba
5e06d749ed Finally removes occurences of OnMenuCommand and closes bug #1164678
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36189 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-16 17:27:38 +00:00
Vadim Zeitlin
582ca3535a don't use wxStaticCast to wxBookCtrlBase -- it doesn't work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36188 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-16 16:31:35 +00:00
Michael Wetherell
dbc459f652 Rebake for new penguin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-16 14:19:52 +00:00
Dimitri Schoolwerth
d997c6118c applied patch #1348053 "[msw] Strip mnemonics when calc best size for static text"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36186 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-16 12:06:54 +00:00
Dimitri Schoolwerth
0f99ce3d75 only remap the disabled bitmap of a toolbarbutton when allowed by system (settings), otherwise colour artifacts can appear
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 23:26:06 +00:00
Mart Raudsepp
6716099174 Any reason why we #if the menuitem bitmap code in the menu sample? For now just adding wxGTK in addition to
wxUSE_OWNER_DRAWN case, for the cases where bitmaps are to be set...


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 22:40:32 +00:00
Vadim Zeitlin
f784a2a96b unhide wxConnectionBase::Execute(wxString)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36183 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 18:05:48 +00:00
Michael Wetherell
c9eee7f035 Add a length parameter for wxRegEx::Matches
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36182 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 15:51:10 +00:00
Michael Wetherell
58b59bb7d5 rcdefs.h is a real file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36181 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 15:36:33 +00:00
Włodzimierz Skiba
f000211ebe Be consistent with all setup.h. Include chkconf.h only once from wx/platform.h.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 14:51:12 +00:00
Włodzimierz Skiba
c0089c96ec Minor cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-15 07:40:12 +00:00
Stefan Csomor
41ab357ed9 corrected wake up code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36175 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-14 20:24:16 +00:00
Julian Smart
4b764db379 Applied patch [ 1355355 ] Replace GPLed code in penguin sample and add features
(with Unicode and scope mods)
By Sandro Sigala


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-14 17:38:24 +00:00
Włodzimierz Skiba
3d1a1d2df6 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36173 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-14 17:03:37 +00:00
Julian Smart
5fd420ed86 Removed GTK+2 bitmap menu item code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-14 08:48:35 +00:00
Włodzimierz Skiba
d126840117 eVC3/PPC2002 build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 21:48:53 +00:00
Włodzimierz Skiba
83cda8eb0a Helpful references.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 21:47:08 +00:00
Włodzimierz Skiba
394b206f07 Typo fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36167 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 21:26:24 +00:00
Mart Raudsepp
c1da50582e Typo fix in comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36166 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 19:51:45 +00:00
Mart Raudsepp
0118b60be6 Might aswell show the compile- and runtime versions of GTK+ in the ctrl+alt+mclick dialog in case of wxGTK.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36165 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 19:44:15 +00:00
Włodzimierz Skiba
94e8d77cbb Missing #ifdef markup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 14:52:34 +00:00
Włodzimierz Skiba
ce82ff93d3 Typo fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 11:53:06 +00:00
Włodzimierz Skiba
08b9726806 Resize all top level windows when SIP changes visibility.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 11:46:24 +00:00
Kevin Hock
6fa30495b5 Fix MDI child windows not becoming active when created after changes to wxTopLevelWindow; BringWindowToTop added to wxMDIChildFrame
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36161 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-13 05:00:32 +00:00
Michael Wetherell
db9db9cd18 Change the name of a symbol to make it more descriptive
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-11 19:33:47 +00:00
Michael Wetherell
f302b6a445 Make wxRegEx::Replace run in linear time
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-11 17:22:13 +00:00
Michael Wetherell
0519aac9db Warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36158 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-11 16:55:03 +00:00
Julian Smart
ece291c7d2 Typo correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-11 14:46:16 +00:00
Roman Rolinsky
306b6fe972 0.1.7-0
-------

Added new controls (Choicebook, Listbook, StatusBar, DatePicker), and
completed style flags. Test window is opened for an available parent
control if no specific view defined. Better handling of exceptions
(highlighting does not 'stick' anymore). Tested on wxGTK 2.6.1.0.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-11 00:23:31 +00:00
Włodzimierz Skiba
6d3d756a6a Macros for simplified testing Open Watcom version and required tweaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36155 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 16:16:05 +00:00
Włodzimierz Skiba
2a2d7a737d Missing commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36154 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 12:49:02 +00:00
Włodzimierz Skiba
b0b4386b6e Missing commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36153 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 12:42:02 +00:00
Włodzimierz Skiba
8735500383 Lineup features of all book driven events.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 12:15:04 +00:00
Włodzimierz Skiba
5b897d36cc Preparation for incoming OW 1.4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36151 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 12:05:11 +00:00
Włodzimierz Skiba
ffd84c9476 Get/SetTitle only for wxTopLevelWindow (wxX11 part, final)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36150 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 12:03:39 +00:00
Vadim Zeitlin
75865c8dc7 add Clone() to wxXXXbookEvent and copy ctor to wxBookCtrlBaseEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36149 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 12:02:00 +00:00
Vadim Zeitlin
e710277282 added wxKeyEvent::GetModifiers()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36148 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 11:59:47 +00:00
Vadim Zeitlin
b2f8e75a0a add Clone() to wxXXXbookEvent and copy ctor to wxBookCtrlBaseEvent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 11:24:19 +00:00
Stefan Csomor
3c3e697033 adding hit testing (needed a hack)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 09:43:03 +00:00
Stefan Csomor
d0e7c7e589 adding hit testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36145 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 09:17:14 +00:00
Stefan Csomor
19d7aad6f2 we're not supporting CW 5 anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36144 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-10 07:29:11 +00:00
Włodzimierz Skiba
6dabe332cb OW 1.4 preparation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36143 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 21:04:54 +00:00
Włodzimierz Skiba
7ec698211d Various source cleanings.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36142 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 20:14:39 +00:00
Włodzimierz Skiba
2a4d2d4680 'rcdefs.h' action has to be phony, otherwise it is expected to be file existing after action execution.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36141 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 19:59:29 +00:00
Michael Wetherell
b46d37d75c Update the build instructions for Win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36140 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 14:17:31 +00:00
Stefan Csomor
e00eeba851 allow a SHAPED flag for a dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 14:08:02 +00:00
Stefan Csomor
8ec0a8fa72 wx..._EX_METAL styles support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36138 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 09:45:58 +00:00
Michael Wetherell
5c60e84569 Regenerate Makefile.in, configure and the VC++ project files after adding rcdefs.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36137 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 02:34:32 +00:00
Kevin Hock
0567fdfceb Restored the accidentally deleted "return true;" at the end of the Show method from last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36136 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 00:30:45 +00:00
Michael Wetherell
47bff9ff8b Correct the directory rcdefs.h installs to
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36135 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-09 00:10:31 +00:00
Michael Wetherell
92641c0dc0 Correct the include order for the resource compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36134 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 23:17:24 +00:00
Michael Wetherell
c8d5853155 Add rcdefs.h and support for automatic manifests on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36133 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 22:49:46 +00:00
Michael Wetherell
4c4863dbe7 Bake fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36132 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 22:24:35 +00:00
Włodzimierz Skiba
5ec5e8cedb More obsolete compatibility removed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36131 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 19:59:51 +00:00
Julian Smart
70dec69b0b Force linking of gprint.cpp, otherwise Gnome printing may not work
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 18:11:12 +00:00
Roman Rolinsky
af52e1853c revision 7
Using system clipboard for Copy/Paste


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36129 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 17:01:38 +00:00
Włodzimierz Skiba
8d8d36335c Get/SetTitle only for wxTopLevelWindow (wxCocoa part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36128 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 16:02:07 +00:00
Włodzimierz Skiba
793b53a004 Get/Set title fixes (#1350999).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 14:59:52 +00:00
Kevin Hock
75e275af32 Remove fudges in Show: 1) Do not force a window to top when it is shown 2) Remove extra ACTIVATE event on show 3) Do not fudge resetting focus after closing a window (always setting to the parent can lead to unnatural results)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 14:41:09 +00:00
Kevin Hock
2175898cf6 Remove always moving window to the top of the Z-order on on Show
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36125 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 14:38:20 +00:00
Włodzimierz Skiba
67eb4cb253 Build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 13:28:34 +00:00
Stefan Csomor
f4b3287fd2 not supported anymore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 07:56:57 +00:00
Stefan Csomor
a6de78177e fix undefined structs under 10.2 (tinderbox)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36122 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 06:33:27 +00:00
Vadim Zeitlin
1e966cc4c8 remvoed wxFileDialogBase::m_parent as there is already one in wxWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36121 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 01:33:33 +00:00
Vadim Zeitlin
153958f72d wxString(const unsigned char *) ctor doesn't crash by default with wxUSE_STL==1 any more
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 01:10:02 +00:00
Vadim Zeitlin
2ee96a251c fix memory leak of wxMessageOutput if wxApp::OnInit() returned false
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 01:02:48 +00:00
Vadim Zeitlin
6dc2a916df fix memory leak of pending events in wxEvtHandler dtor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-08 00:45:46 +00:00
Mart Raudsepp
8fb824187d [wxGTK] Support run-time changing of the wxFRAME_NO_TASKBAR style value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36117 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 23:06:34 +00:00
Mart Raudsepp
015dca24ca [wxGTK] Support changing the wxSTAY_ON_TOP style value run-time through wxWindow::SetWindowStyleFlag, support for
more styles to follow


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 20:00:50 +00:00
Mart Raudsepp
56aed4aace Fix formatting tag in frame.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36114 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 18:23:51 +00:00
Mart Raudsepp
d37e85cd9b Fix formatting in bbutton.tex
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36113 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 18:21:49 +00:00
Stefan Csomor
fd39aa23bc adjusting to SetLabel migration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36112 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 17:56:17 +00:00
Stefan Csomor
44f9d0aa55 adjusting to SetLabel migration
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36111 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 17:05:04 +00:00
Stefan Csomor
f51374fe9d cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 17:02:57 +00:00
Stefan Csomor
d4bd6c97be cleanup, adding correct window-ids to window events (important when using eg Connect)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 17:01:15 +00:00
Stefan Csomor
26a2f9144b cleanup, using Tiger funcs if possible
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 16:58:32 +00:00
Stefan Csomor
d32be04cd7 support for wxNO_BORDER
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 16:36:00 +00:00
Stefan Csomor
51cdab3ef8 CGImage Creation is always available under OS X
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 16:34:48 +00:00
Stefan Csomor
57a21e6c45 switch to a CoreFoundation based and thread-safe implementation for message boxes for Mach-O builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 14:59:34 +00:00
Włodzimierz Skiba
fb5246bead Get/SetTitle only for wxTopLevelWindow (wxMac part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36104 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 14:37:19 +00:00
Włodzimierz Skiba
cdc059191b Fixed #1338966.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36103 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 13:47:44 +00:00
Włodzimierz Skiba
ce045aed58 wxGetWorkingDirectory() deprecated. Fixed #1338966.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 13:27:09 +00:00
Julian Smart
f3e874756b Don't resend an update event from m_spin to avoid recursion
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36100 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-07 10:15:42 +00:00
Włodzimierz Skiba
caae22fb66 eVC4 warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36098 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 21:42:01 +00:00
Włodzimierz Skiba
41e155b43e eVC4 warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36097 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 20:44:43 +00:00
Włodzimierz Skiba
792f83f038 Speedup for adding array of items.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 18:47:25 +00:00
Stefan Csomor
377a6b3ef5 not needed for CG
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 07:23:14 +00:00
Stefan Csomor
18b94824f5 added CFRef holder templated class
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-06 07:19:18 +00:00
Włodzimierz Skiba
316189733a Native wxCheckListBox implementation for wxWinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-05 22:49:33 +00:00
Stefan Csomor
24cd6f8250 finished implementation for stencil and colored patterns
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-05 16:53:42 +00:00
Vadim Zeitlin
bf00c875fe documented wxStringTokenize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36091 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-05 13:48:02 +00:00
Julian Smart
6270539bcf Set HTML data even in Unicode mode
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-05 10:25:59 +00:00
Stefan Csomor
3ca57155b4 added permission error to the 'expected' error codes, removed assert, as this leads to problems in wxPython otherwise, and getting another error essentially means we cannot continue iterating..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-05 07:39:46 +00:00
Włodzimierz Skiba
743e24aa72 Get/SetTitle only for wxTopLevelWindow (wxOS2 part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 21:13:03 +00:00
Roman Rolinsky
c032d94e60 version 0.1.6-6
Improved some dialogs (window styles, growable cols). Changed the
range for wxSpinCtrl min/max to all integers (default 0/100 is not
always good).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36087 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 20:17:52 +00:00
Włodzimierz Skiba
46ae103b9f Get/SetTitle only for wxTopLevelWindow (wxMGL part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 18:49:49 +00:00
Włodzimierz Skiba
72c23f8e29 Get/SetTitle only for wxTopLevelWindow (wxGTK part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 15:14:42 +00:00
Włodzimierz Skiba
340bfb43eb Get/SetTitle only for wxTopLevelWindow (wxGTK part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36084 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 14:19:41 +00:00
Włodzimierz Skiba
5bc3865fdf Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 12:50:11 +00:00
Włodzimierz Skiba
2ea5111b0a Get/SetTitle only for wxTopLevelWindow (wxGTK part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 12:30:03 +00:00
Włodzimierz Skiba
cb8cc2506b Get/SetTitle only for wxTopLevelWindow (wxGTK part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36081 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-04 11:11:22 +00:00
Włodzimierz Skiba
d40209bbc4 Build fix after last commit.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 22:14:34 +00:00
Włodzimierz Skiba
34097680c0 Get/SetTitle only for wxTopLevelWindow (wxMotif part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 20:58:02 +00:00
Vadim Zeitlin
7996ff8038 use focused bitmap as fallback for the hover one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36078 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 19:38:20 +00:00
Vadim Zeitlin
3e764e2f80 added checkbox to enable setting (or not) individual wxBitmapButton bitmaps
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 19:29:18 +00:00
Włodzimierz Skiba
dbf38e885e Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 16:53:29 +00:00
Włodzimierz Skiba
faa49bfd39 Get/SetTitle only for wxTopLevelWindow (wxMSW part).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36075 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 16:47:29 +00:00
Włodzimierz Skiba
60fef9643d Get/SetTitle only for wxTopLevelWindow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36074 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 16:27:19 +00:00
Stefan Csomor
64bd657c27 support for 10.4 provided context menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36073 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 14:23:22 +00:00
Kevin Hock
fa349e95cc Use toplevel parent rather than immediate parent as color dialog's parent window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 02:50:00 +00:00
Michael Wetherell
391e89ae17 Initial attempt at some instructions on building for Win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 02:25:01 +00:00
Vadim Zeitlin
6aad0c7037 fixed compilation breakage in 1.24 commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36070 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 01:56:02 +00:00
Vadim Zeitlin
1fdc16adf7 added SetHoverBitmap() and implemented it under wxMSW; extended the docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36069 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 01:48:10 +00:00
Vadim Zeitlin
552271d6ad added test of wxBitmapButton
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 01:28:17 +00:00
Michael Wetherell
b4a12e485b Remove bufferoverflowu.lib since it's not present with some versions of VC++ 8
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 00:40:45 +00:00
Vadim Zeitlin
6b5a2b6fe9 deprecate SetLabel(const wxBitmap&)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36065 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-03 00:40:00 +00:00
Włodzimierz Skiba
4b39770c38 Bug #1220988 fixed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36063 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 16:52:23 +00:00
Stefan Csomor
44aa865dfc default implementations for Replace and Remove
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36062 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 16:40:56 +00:00
Stefan Csomor
ce0d1032d1 applying patch 1345435
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 15:22:39 +00:00
Stefan Csomor
6567c540f5 re-added support for help-menu and application-menu items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36059 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 14:50:10 +00:00
Włodzimierz Skiba
4262d65eb1 Build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 13:59:40 +00:00
Chris Elliott
63c02113db add missing header
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36057 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 09:49:16 +00:00
Chris Elliott
60ff2335c4 add missing header to allow ../src/common/docview.cpp to compile
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-02 09:18:52 +00:00
Włodzimierz Skiba
60104cbafa wxMultiChoiceDialog uses now wxCheckListBox if possible, wxListBox if not
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36055 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-11-01 22:35:50 +00:00
Michael Wetherell
4b8f856e6f Add some files to 'make dist' for wxCocoa
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 22:22:41 +00:00
Michael Wetherell
b7859132ae Modify wxString::operator<<(wxLongLong_t) to avoid warnings from mingw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36048 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 20:27:17 +00:00
Michael Wetherell
e4809643b4 Include $cross_root/include in header search when cross compiling
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 20:21:12 +00:00
Vadim Zeitlin
f9f75df733 using newlines in AC_CONFIG_COMMANDS() first argument breaks config.status under cygwin, so don't do it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36046 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 20:14:39 +00:00
Vadim Zeitlin
91a1ee8637 disable PCH under cygwin, it doesn't work even with the very latest cygwin gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36045 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 19:59:52 +00:00
Vadim Zeitlin
136b3b1914 #undef CreateFont to fix cygwin compilation now that wxRichTextCtrl uses it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 19:35:41 +00:00
Włodzimierz Skiba
127eab18f8 wxMGL revitalised with OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36043 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 17:14:55 +00:00
Włodzimierz Skiba
b8af111fa5 wxMGL revitalised with OpenWatcom.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36042 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 17:00:43 +00:00
Julian Smart
fcdbeefa4e Applied patch [ 1341085 ] richtext xml build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-31 14:27:53 +00:00
Włodzimierz Skiba
ddc2587f4a wx/os2/chkconf.h added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-30 20:32:44 +00:00
Vadim Zeitlin
1f00af0e9e fix for incorrect member initialization order warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36039 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-30 20:20:27 +00:00
Vadim Zeitlin
ae0ca7559c renamed BLOCK_SIZE which conflicts with a #define in a std Linux (and maybe not only) header (bug 1339731)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36037 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-29 17:46:12 +00:00
Vadim Zeitlin
a30ccc2d42 don't get margin to non NULL values in default ctor, this is inconsistent as default ctor + Create() don't do the same thing as non default ctor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-29 17:43:11 +00:00
Włodzimierz Skiba
6092f24fae eVC3 build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36035 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-29 15:18:18 +00:00
Włodzimierz Skiba
7b504551c2 Pressing build-in joystick on WinCE phones fires wxEVT_JOY_BUTTON_DOWN event.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36034 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-29 12:48:07 +00:00
Kevin Hock
2cb94e7ad6 Fixed description with number of ways to use timer class, updated note about main thread to remove obscure "NB" which may not be well understood and removed confusing word "currently"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 16:01:24 +00:00
Chris Elliott
2c028d8308 remove GetImageList(int)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36032 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 14:33:05 +00:00
Julian Smart
b01ca8b6a9 Applied patch [ 1339882 ] richtext misc cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 14:24:04 +00:00
Chris Elliott
bb0d2f0379 remove GetImageList(int)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 14:05:49 +00:00
Włodzimierz Skiba
7dab17dd7a Build fix for WinCE.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 09:12:15 +00:00
Vadim Zeitlin
a843caf3e1 fixed MCSetMovie() signature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-28 01:08:03 +00:00
Włodzimierz Skiba
0ed94e8347 WinCE build fix according to eVC3 and eVC4 SDKs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-27 21:22:48 +00:00
Julian Smart
ebefb30e51 Sorry, forgot default value
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36026 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-27 21:00:26 +00:00
Włodzimierz Skiba
d2bad02dbb WinCE build fix (we need default constructor).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-27 20:57:10 +00:00
Włodzimierz Skiba
cb7d73757f Support for automatic setup.h in OS/2 with OW builds. __WXOS2__ final removal. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-27 16:01:45 +00:00
Chris Elliott
ec90484017 SF bug 1327872
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 20:48:09 +00:00
Chris Elliott
3f93a7508e avoid hidden GetImageList
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 20:09:10 +00:00
Julian Smart
dd9ea234f2 Do a sanity check before reading. Otherwise, if trying to read a duff image file,
the app can abort if you pass a specific image type, but simply show an error
message if you pass wxBITMAP_TYPE_ANY.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 14:08:43 +00:00
Włodzimierz Skiba
90c0f5a958 Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 12:44:28 +00:00
Julian Smart
3db5226517 Added parent window parameter to wxHelpController constructor
and added SetParentWindow/GetParentWindow.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 09:32:10 +00:00
Jouk Jansen
b4f9b09cb9 Committing in .
Updated OpenVMS compile options

 Modified Files:
 	wxWidgets/setup.h_vms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36016 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 06:20:19 +00:00
Mart Raudsepp
df034cc6d5 Compilation fix...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36014 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-26 00:26:34 +00:00
Włodzimierz Skiba
9a173d48f7 wxWinCE build fix and source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 23:18:15 +00:00
Julian Smart
0bab774ba3 Fixed warnings/errors and changed Thaw
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 17:51:10 +00:00
Mart Raudsepp
d9f42a9e5a Alphabetize wxWindow members list
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36011 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 16:35:25 +00:00
Michael Wetherell
2bc63d3f80 Add missing files to 'make dist'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36010 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 16:25:17 +00:00
Michael Wetherell
8bda759f44 Add libraries.h, amd64.manifest and ia64.manifest
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36009 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 15:32:11 +00:00
Chris Elliott
89220a9428 missing #include (SF bug 1327872)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 13:58:32 +00:00
Vadim Zeitlin
07f9359380 fixed DLL compilation warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 13:11:18 +00:00
Julian Smart
76bcd8154c Don't clear background in Refresh (to suit poor implementations of Refresh)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36006 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-25 10:41:38 +00:00
Włodzimierz Skiba
068becf562 Move wxMulDivInt32 to common math.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-24 18:56:33 +00:00
Michael Wetherell
d9b30c5a6c Always define wxUSE_OWNER_DRAWN so that we don't get lots of warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-24 12:52:24 +00:00
Michael Wetherell
4d56c20d2c Add missing wxUniv files to msw and gtk tarballs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 23:01:26 +00:00
Włodzimierz Skiba
5ccb95f690 WinCE build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36002 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 22:37:58 +00:00
Michael Wetherell
9f8b9d9cc1 Export wxFindFocusDescendant
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 22:16:33 +00:00
Michael Wetherell
ebef1625fa Rebake after adding libs html and xml to samples using lib adv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 21:56:27 +00:00
Michael Wetherell
2fa7bb014e Add libs html and xml to bakefiles of samples/contribs/demos using lib adv
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 21:52:24 +00:00
Michael Wetherell
3708784b46 Add missing files to release tarballs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35998 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 21:44:01 +00:00
Michael Wetherell
16bb2e119d Add missing files to the distribution tarballs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 21:02:56 +00:00
Stefan Neis
fbf618dff8 Removed unused symbol __WXOS2__ (it's either __OS2__ when platform specific
- similar to __UNIX__ - or __WXPM__ when specific to the port - similar
       to symbols __WXMOTIF__ or __WXGTK__).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35996 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 20:42:59 +00:00
Włodzimierz Skiba
96531a71a0 filename correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35995 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 20:40:42 +00:00
Stefan Neis
554fdf48f5 Replaced __WXOS2__ by __OS2__ or __WXPM__ as apropriate.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35994 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 20:30:53 +00:00
Michael Wetherell
de5f07794d Add more missing files to the tarballs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 19:52:36 +00:00
Michael Wetherell
8869c3a1ce Add missing files to the tarballs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35992 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 14:57:19 +00:00
Julian Smart
bc88602a65 Patch [ 1314868 ] [wxMSW] Show MDI child menubars when ShowFullScreen(false)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 11:05:46 +00:00
Julian Smart
3d3afaecfb Applied patch [ 1310416 ] [wxMSW] Fix radio button traversal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35990 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 10:59:01 +00:00
Julian Smart
1ca78aa1dc Applied patch [ 1307056 ] [wxMSW] Focus showing fix for Win2k/XP
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-23 10:53:16 +00:00
Michael Wetherell
dbeb8eacae Prepare the way to make 'make dist' default to copying files, with linking an option.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35988 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 16:24:49 +00:00
Julian Smart
2f36e8dce5 Now works when derived from wxTextCtrlBase, using wxScrollHelper.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35987 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 13:44:30 +00:00
Julian Smart
a4f4d548ce Font (possible) fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 12:10:34 +00:00
Julian Smart
09f1410821 Corrections for wxUSE_STL=1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 11:40:32 +00:00
Julian Smart
4708068cb6 Wine corrections
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35984 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 10:22:48 +00:00
Julian Smart
9e31a66087 More Erase substitutions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35983 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 09:24:49 +00:00
Julian Smart
11ef729d54 Added missing include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 09:20:09 +00:00
Julian Smart
4837b89e3b Use GetFont not m_font for GetCharHeight
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35981 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 08:51:12 +00:00
Julian Smart
c4cd20cfa7 Removed duplicate hotkey
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35980 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 08:46:41 +00:00
Julian Smart
efbf673503 Replace node deletion with Erase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35979 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 08:05:19 +00:00
Włodzimierz Skiba
39a1c2f2dd wxTinderbox build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35978 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-22 07:45:54 +00:00
Julian Smart
d21423356e Don't try to open clipboard if already open
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35977 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 20:43:02 +00:00
Julian Smart
c59f6793fb Reduced unnecessary painting; delete/recreate caret as WIN32 requires
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35976 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 20:04:53 +00:00
Michael Wetherell
a027779a10 Add missing directories and utils to the wxBase tarball
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35975 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 19:57:09 +00:00
Włodzimierz Skiba
0ad966eeac Allow translated 'Space' in menu accelerators (perhaps more entries should allow it).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 19:06:45 +00:00
Włodzimierz Skiba
2ddb4d1358 Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised code for sizing internals.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 19:03:06 +00:00
Włodzimierz Skiba
d8fd7acb8b Unified flags for orienting wxBookCtrls (with backward compatibility). Centralised code for sizing internals.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35971 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 18:53:51 +00:00
Vadim Zeitlin
eb42e596aa blind compilation fix for TestScopeGuard()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 17:33:42 +00:00
Julian Smart
ff2baa25d5 Switched antialiasing off since GetTextExtent doesn't work properly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 16:31:07 +00:00
Michael Wetherell
4383e2b12a Adv now depends on libs xml and html, so add <library> tags for these and
bakefile takes care of everything.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35968 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 16:18:45 +00:00
Michael Wetherell
2f27c88987 Fix a couple of export declarations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 16:02:25 +00:00
Julian Smart
7383cf9d17 Fixed warning, move caret in OnPaint
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35966 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 14:50:29 +00:00
Julian Smart
be665c07ab Regenerated configure for wxUSE_RICHTEXT
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 14:23:18 +00:00
Julian Smart
4e09ebe880 Restored code uglies
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 13:54:15 +00:00
Julian Smart
dc043de063 Removed macros
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35963 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 13:14:16 +00:00
Julian Smart
4d551ad5e5 Fixed some styling bugs, optimized resize for large files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35962 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 13:02:15 +00:00
Vadim Zeitlin
907c39f19b fixed typo in GetNextItem example (bug 1333797)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-21 11:18:34 +00:00
Julian Smart
169adfa9c4 Resets scroll position on load
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 22:51:57 +00:00
Michael Wetherell
e4d6cfadda Add configtool to the distribution tarballs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35959 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 21:43:00 +00:00
Michael Wetherell
91dea3144c Small changes to 'make dist' to allow it work on Solaris, and to use the
result of AC_PROG_LN_S when making links.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35958 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 19:48:26 +00:00
Julian Smart
162a4f9382 Support wxALWAYS_SHOW_SB
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35957 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 17:30:24 +00:00
Włodzimierz Skiba
e191ee8751 Warning fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 14:40:47 +00:00
Julian Smart
1e967276d8 Efficiency measures; file loading bug fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-20 12:55:53 +00:00
Julian Smart
3811368401 Introduced invalidation of ranges for later optimization code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35954 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 22:20:12 +00:00
Włodzimierz Skiba
7fe8059f58 const consistent for Clone(). Load/Save split to DoLoad/DoSave. Build fixes, warning fixes and other source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35953 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 17:00:58 +00:00
Włodzimierz Skiba
7f9d2f2aaf richtext.bkl added and dmars makefiles removed.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 16:56:27 +00:00
Julian Smart
2c375f42cf First part of a layout optimization
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 14:44:15 +00:00
Julian Smart
011b3dcbef Only draw if inside client rectangle
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35950 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 13:54:32 +00:00
Julian Smart
5d7836c47d Added wxRichTextCtrl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 12:52:47 +00:00
Włodzimierz Skiba
65de19d80a constfunc correction
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35947 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-19 10:12:49 +00:00
Michael Wetherell
2f5e790cb1 Restore ALL_BASE_HEADERS to its previous meaning of 'all for a given port' as
it is used in this sense in rpmspec.bkl, add ALL_PORTS_BASE_HEADERS for
'make dist', and rebake.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 20:50:46 +00:00
Michael Wetherell
14ff1954ae Add note that precompiled headers do not work on current Cygwin.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 18:54:13 +00:00
David Elliott
ae999b11ec Remove sm_cocoaDelegate singleton. We need per-instance data anyway so we
may as well make it the target instead of the userInfo.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 16:02:51 +00:00
David Elliott
06c2bab085 Replace wxNSTimerData -setTimer method with -initWithWxTimer: initializer
which correctly calls the superclass (NSObject) init.

Add an -init method for correctness; technically not needed as it is never
called but it's an Objective-C best practice.

Release the wxNSTimerData instance just after passing it to the NSTimer
factory method.  NSTimer retains it and we don't keep a pointer to it
so we should not keep a refence to it.  This fixes the bug in wxTimer::Stop
where the program crashes in the NSCFTimer userInfo method because the
NSTimer has already been invalidated.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35941 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 15:27:48 +00:00
Włodzimierz Skiba
159e6235b2 Set/get for internal border in book based controls.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 12:31:11 +00:00
Włodzimierz Skiba
afe1376994 compilation fix after wxScrollHelper changes (ctor argument is now not optional and SetWin doesn't exist any more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 11:13:34 +00:00
Jouk Jansen
6694ee19fc Committing in .
Updated openvms compile support
 Modified Files:
 	wxWidgets/src/generic/descrip.mms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 10:18:00 +00:00
Vadim Zeitlin
c3ee2228e5 compilation fix after wxScrollHelper changes (ctor argument is now not optional and SetWin doesn't exist any more)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-18 00:03:36 +00:00
Michael Wetherell
5d4a10e70a Revert accidental change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35924 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 23:45:25 +00:00
Vadim Zeitlin
74205969dd fixed Fit() to call SetClientSize() and not SetSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 22:41:52 +00:00
Michael Wetherell
871192ce0f Widen the hash key for win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 22:11:49 +00:00
Michael Wetherell
4a10ea8b13 Warning fixes for win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35921 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 22:08:05 +00:00
Włodzimierz Skiba
c0f420c1ac wxTinderbox build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 21:49:58 +00:00
Włodzimierz Skiba
1a4138c79a Follow changes in common code.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35919 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 19:51:31 +00:00
Vadim Zeitlin
22574b4a9c renamed DoHitTest() to DoTreeHitTest() to avoid conflict with existing wxWindow method
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35918 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 19:31:40 +00:00
Włodzimierz Skiba
b220b1a2c8 Warning fix (instead of silencing int->short with typecast, have the same type internally as in interface).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35917 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 17:57:04 +00:00
Michael Wetherell
a84d5f9da1 Link with bufferoverflowu.lib for VC++ 8 and later
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 17:46:11 +00:00
Włodzimierz Skiba
30e105e429 Keep setup0.h in sync with more ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 17:40:36 +00:00
Włodzimierz Skiba
e9ac5f0244 Keep setup0.h in sync with other ports.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35914 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 17:11:33 +00:00
Michael Wetherell
fcd8dd3f33 Compile fix for Unicode build on win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35913 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 17:08:28 +00:00
Włodzimierz Skiba
07319f2aaf htmlctrl sample is not for msw toolkits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 16:39:19 +00:00
Michael Wetherell
6429ac6d63 Warning fix, should be #ifdef instead of #if
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-17 16:14:49 +00:00
Michael Wetherell
ab6ea1ac2f Regenerate the msvc makefiles after TARGET_CPU option added
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 20:35:41 +00:00
Michael Wetherell
e396018def Use a different manifest for each of x86, amd64 and ia64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 20:28:24 +00:00
Michael Wetherell
e40b74ba83 Add CPU_TARGET option to msvc makefiles for targeting AMD64 and IA64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35908 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 20:25:10 +00:00
Stefan Neis
d6701f32aa Fixed event handling bug as suggested by Lech Wiktor Piotrowski.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35907 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-16 17:13:16 +00:00
Michael Wetherell
3fc1adbd94 Implement string inserter for long long. This creates a problem on mingw as gcc
gives a warning unless -Wno-format is used, one of the most useful warnings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35906 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-15 19:16:59 +00:00
Michael Wetherell
4948c2b6c8 Typo, should be #if not #ifdef
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35905 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-15 19:11:05 +00:00
Michael Wetherell
6c1a7bc483 Temporarily disable test that takes a long time to run, needs moving to a named registry
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-15 19:04:29 +00:00
Michael Wetherell
ea75e99e8f Compilation fix for platforms where size_t is larger than long
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-15 19:01:25 +00:00
Michael Wetherell
a901c3fde9 Compilation fix, templates are broken on 64-bit VC++ 8.0 beta 2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35902 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-15 19:00:12 +00:00
Michael Wetherell
ac11db3a77 Restore WC_UTF16, required for compilation on Windows
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-15 18:58:06 +00:00
Roman Rolinsky
efa5f7095f fix for correct type of checklist box items
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-14 16:16:37 +00:00
Roman Rolinsky
4483a6ed97 iconize properties frame together with main
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-14 16:13:20 +00:00
Vadim Zeitlin
01b8292d11 fixed OnSysWrite() signature
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35898 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-14 08:39:02 +00:00
Julian Smart
b71e90034f Added "enabled" support for submenus
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35897 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-13 10:44:50 +00:00
Michael Wetherell
c1b6178278 Implement wx_truncate_cast for VC++ 7.1 and later
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35896 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-12 15:03:16 +00:00
Michael Wetherell
e5d92e2bef Avoid cast in wx_truncate_cast for intel compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-12 13:05:17 +00:00
Vadim Zeitlin
6495ea3f1d removed .cvsignore entries which were old/unused/duplicated in CVSROOT/cvsignore
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-12 12:06:11 +00:00
Michael Wetherell
119a60edd3 Manifest files for win64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-12 11:47:09 +00:00
Mart Raudsepp
1fd0e166f3 Fix includes in wx/treectrl.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35892 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-12 07:49:14 +00:00
Vadim Zeitlin
9f1a446692 clarified ScrollWindow() docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35891 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-12 00:20:31 +00:00
Vadim Zeitlin
b719fd8d81 64 bit compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35890 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-11 15:52:49 +00:00
Vadim Zeitlin
b2aba33179 added wx/xrc/xh_treebk.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-11 15:51:10 +00:00
Dimitri Schoolwerth
b04ada921f fixed argv[0] out of bounds error (argc can be 0 when wxEntry is manually called in a plugin environment for example)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35888 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-11 15:05:03 +00:00
Dimitri Schoolwerth
2b053ae90a fixed MSVC6 compilation error ("C2639: compiler generated default constructor required by unnamed class")
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35887 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-11 15:01:50 +00:00
Vadim Zeitlin
42e53e7771 another fix for !USE_PCH: added missing wx/imaglist.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35886 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-11 13:40:39 +00:00
Vadim Zeitlin
2cd354c9c6 compilation fix for !USE_PCH: added missing wx/panel.h include
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-11 12:50:23 +00:00
Vadim Zeitlin
bc454ef84c invalidate tree size after adding/removing pages; use portable style for the tree control
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 22:30:52 +00:00
Vadim Zeitlin
3e4f8ee256 removed hardcoded DoGetBestSize() implementation; added support for textOnly parameter in GetBoundingRect()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35883 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 22:29:39 +00:00
Vadim Zeitlin
46bde8dcf2 removed duplicated members which have been moved to wxTreeCtrlBase
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35882 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 21:49:23 +00:00
Vadim Zeitlin
4c2a39bec1 removed deprecated InsertItem() overload because it masked all the other ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35881 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 21:46:24 +00:00
Vadim Zeitlin
642446e3bf Windows compilation fixes after wxTreeCtrl refactoring
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 20:36:20 +00:00
Vadim Zeitlin
8cee4a304f introduced a common base class for both MSW and generic wxTreeCtrl implementations
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 20:25:02 +00:00
Vadim Zeitlin
d2dfef5f3f corrected code to really skip stack frames in the beginning and to number the remaining frames correctly
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 20:11:29 +00:00
Kevin Hock
345bdf13c0 For consistency with other ports, send TEXT event after SELECTED event
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 19:10:29 +00:00
Michael Wetherell
6c9ddf03f0 Fix typos: '==' should be '='
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 18:43:29 +00:00
Vadim Zeitlin
d32e78bd42 refactored wxGTK scrolling: it has now fully-functioning wxScrollHelper and a lot of duplicate code was removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 18:24:27 +00:00
Vadim Zeitlin
87a3ebe978 added GtkUpdateScrollbar; folded some code duplicated for horz/vert orientations in a single branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35874 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 18:22:47 +00:00
Vadim Zeitlin
ee146bca1b added GetWindowSizeForVirtualSize() virtual hook for wxScrolledWindow (cuts down on code duplication in its DoGetBestSize())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35873 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 18:15:34 +00:00
Michael Wetherell
bcaab0f92e Use 'cp -pR' as a fallback for lndir, remove $(shell) construct from makefile.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35872 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 16:29:02 +00:00
Jouk Jansen
21a186a1fc Committing in .
Small fixes for OpenVMS

 Modified Files:
 	wxWidgets/include/wx/vms_x_fix.h
 	wxWidgets/src/motif/xmcombo/xmcombo.c
: ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 14:18:40 +00:00
Vadim Zeitlin
583d6b4bd2 regenerated after bakefile change to always create shared-ld-sh under Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35870 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 12:59:12 +00:00
Vadim Zeitlin
89ec5d1421 always create shared-ld-sh as we always need it for bundles (even when we don't need it for dylibs)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35869 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 12:48:40 +00:00
Michael Wetherell
0ffc92133b Make _dist_dir a shadow directory of symlinks rather then copied files, and add
a 'distdir' target to make _dist_dir without creating a tarball.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-10 10:37:24 +00:00
Vadim Zeitlin
77df51f4fb disable VC++ warning 4355 in wx/defs.h once and for all instead of doing it in 4 different places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 22:34:08 +00:00
Vadim Zeitlin
547703373c regenerated with treebook files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 22:24:57 +00:00
Vadim Zeitlin
0093c2fc5f configure with wxUSE_TREEBOOK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35864 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 22:11:29 +00:00
Vadim Zeitlin
136bafcd39 compilation fixes for wxUSE_TREEBOOK=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 22:09:35 +00:00
Vadim Zeitlin
eca15c0d54 Added wxTreebook:
- added the control itself
- added protected wxBookCtrlBase::AllowNullPage() to accommodate it
- big changes to the sample to get rid of (most) ugly macros
- added XRC handler for the control
- added docs
- and wxUSE_TREEBOOK everywhere


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 18:40:36 +00:00
Vadim Zeitlin
97c58531bf made GetPage() not virtual because it doesn't need to be virtual and this allows to have const overload of it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 17:26:09 +00:00
Vadim Zeitlin
49732ef201 corrected GetBestSize() implementation: take all items, not just the currently visible ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35860 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 17:19:43 +00:00
Vadim Zeitlin
a068160f9f don't call ::ShowWindow() if don't have HWND yet
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 16:52:41 +00:00
Mattia Barbon
dee1a63ff5 Removed WXWIN_COMPATIBILITY_2_2 together with code guarded by it.
Changed default for WXWIN_COMPATIBILITY_2_4 to 0.
  Added WXWIN_COMPATIBILITY_2_6 (defaults to 1).
  Ran build/update-setup-h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35858 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 15:48:42 +00:00
Vadim Zeitlin
92b0cd9eb0 don't put borders by default between sizer elements on smartphones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 14:32:53 +00:00
Vadim Zeitlin
96d8f9207f implemented GetBestSize() (TODO: make this available in generic version as well)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 13:38:15 +00:00
Vadim Zeitlin
c358ea4147 filter out duplicate mouse move events too; moved last mouse event info from wxWindow class to static variables (there is only one mouse in the system after all, no need to duplicate this data in all windows)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35855 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 13:04:40 +00:00
Vadim Zeitlin
2eef85139b don't use -single_module together with -bundle under Darwin (ld gives an error for this)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35854 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 12:49:09 +00:00
Vadim Zeitlin
d1dbe757c0 blind compilation fix for CW 8.3 in Unicode build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35853 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 12:32:56 +00:00
Vadim Zeitlin
138861bcdd don't use __MSL__ unless it's defined
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35852 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-09 12:23:58 +00:00
Vadim Zeitlin
6e86d7842e show the OS information in the about dialog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 21:55:33 +00:00
Vadim Zeitlin
179daed8f0 enable all warnings (but disable some of them) for DEC/Compaq/HP C++ compiler
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 21:28:12 +00:00
Vadim Zeitlin
3f9ee1cd85 fixed unused parameter warnings in non-debug build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35849 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 21:24:32 +00:00
Vadim Zeitlin
ad60f069f1 always connect to both XmNvalueChangedCallback and XmNdragCallback
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 18:35:36 +00:00
Vadim Zeitlin
31df756d74 more 'unreachable code' warnings which had been disabled instead of being fixed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35847 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 18:33:28 +00:00
Vadim Zeitlin
e933b5bc36 extra semicolons removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 17:10:10 +00:00
Vadim Zeitlin
a7bdad336c unused params warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 17:01:52 +00:00
Vadim Zeitlin
541c319a2d fixed logic bug in DoSetSize() (disabling a warning is good, fixing it is even better...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35842 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 16:58:25 +00:00
Vadim Zeitlin
68aef3dc22 added support for OSF1 (Tru64)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35841 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 16:57:07 +00:00
Vadim Zeitlin
741d91c5e4 harmless DEC cc warning fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35840 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 16:56:42 +00:00
Vadim Zeitlin
f1f5039b45 don't use wxCHECK_GCC_VERSION in the same test as __MINGW32__/__CYGWIN32__ as it could be undefined (DEC cc warning fix)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 16:56:01 +00:00
Vadim Zeitlin
a09f8377ec use for instead of while for infinite loop (the latter provokes a warning from DEC cc)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35838 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 16:54:43 +00:00
Vadim Zeitlin
a1aa0349f8 added dependencies support for DEC/Compaq/HP cxx compiler (new bakefile files; regenerated configure)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 15:33:10 +00:00
Vadim Zeitlin
d368dbeaef try setting locale n wxLocale::Init(lang) to xx_YY.utf8 if xx_YY is not supported
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35836 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 00:37:31 +00:00
Vadim Zeitlin
0fad0dfda8 hack: adjust C locale to supported form under HP-UX, otherwise we crash on startup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35835 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 00:36:50 +00:00
Vadim Zeitlin
346f42313b check whether setting locale for the selected language succeeded
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 00:35:11 +00:00
Vadim Zeitlin
ed00b1195c added ja_JP.EUC-JP catalog
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35833 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-08 00:33:34 +00:00
Vadim Zeitlin
76f13e9040 disable some (unavoidable) HP-UX aCC warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35832 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 21:56:51 +00:00
Vadim Zeitlin
aab6965a93 don't define unused functions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35831 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 21:55:12 +00:00
Vadim Zeitlin
4b2322641a fixed check for bitmapType match (thanks to HP compiler for the warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 21:49:20 +00:00
Vadim Zeitlin
f3f4302326 undid last commit, the neceesary defines fo HP-UX are now provided by configure
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 21:45:59 +00:00
Vadim Zeitlin
65baafba0e define _HPUX_SOURCE under HP-UX, otherwise many things are not defined in standard headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35828 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 21:35:48 +00:00
Vadim Zeitlin
c25e6f326b removed C++ comment from C file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 21:33:00 +00:00
Michael Wetherell
df7e062c8c Attempt to avoid crash on exit on Solaris 10
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35826 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 21:08:00 +00:00
Vadim Zeitlin
3006edc092 optimization: don't test for various proprietary Unix compilers unless we're running under OS they support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35825 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 20:27:47 +00:00
Vadim Zeitlin
14cde5136d ltest files from bakefile add HP aCC dependencies support
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35824 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 15:39:34 +00:00
Włodzimierz Skiba
ae0fbceefa #include markup fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 14:01:37 +00:00
Włodzimierz Skiba
d66551669c #include markup fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-07 08:36:08 +00:00
Vadim Zeitlin
9ead8387d0 added more HP-UX charset names
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 23:28:03 +00:00
Vadim Zeitlin
e524af66ad added HP-UX names for ISO8859-x charsets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 23:25:20 +00:00
Michael Wetherell
4aa1c27094 Compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35815 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 23:02:40 +00:00
Michael Wetherell
888407a108 Unicode compile fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35814 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 22:52:03 +00:00
Włodzimierz Skiba
6b62c9ad44 #include markup fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 18:17:23 +00:00
Włodzimierz Skiba
88ef3a57a4 wxPalette unified. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 14:37:43 +00:00
Vadim Zeitlin
2c01d33555 don't use a floating point value as a boolean flag; gcc4 (correctly) complains when it's compared with 0; use different function for setting the current and given time in wxMacCarbonEvent instead
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 12:53:24 +00:00
Włodzimierz Skiba
355b4d3de5 wxMotif for OS/2 adjustements. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 12:10:44 +00:00
Włodzimierz Skiba
7fc65a0384 wxMotif for OS/2 adjustements. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 11:14:42 +00:00
Vadim Zeitlin
10498b330d another file where the version should be updated
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 09:09:18 +00:00
Vadim Zeitlin
01cca03e20 change fallback default for wx version to 27
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-06 09:08:27 +00:00
Kevin Hock
ad4a6192d7 Updated link to comctl32 download [ patch 1311650 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35803 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-05 23:31:10 +00:00
Kevin Hock
9b67181b39 When recv returns 0, the connection has been remotely closed or dropped. Changes are to Read [ modified patch 1303565 ] and Select [ patch 1283936 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-05 23:20:10 +00:00
Włodzimierz Skiba
edc536d358 wxColour source cleaning. Corrections to 'const unsigned char' within wxColour docs.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-05 16:22:44 +00:00
Kevin Hock
6e21a3db8a Revert last change, which made it impossible to set a custom text color and then query the color. Instead, set the correct system/theme color when the control is created and use the original GetTextColour method.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-05 15:42:16 +00:00
Kevin Hock
c3b501e187 Do not allow events to fire after socket is closed (fixes crash on GTK with GDK_Input events) [Patch 1281054]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-05 15:38:44 +00:00
Vadim Zeitlin
12af050427 silence a few (harmless) HP aCC warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-05 12:11:00 +00:00
Włodzimierz Skiba
1a1498c08b Fix for mistake with const for non pointer/reference with corrections in documentation.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 18:14:41 +00:00
Vadim Zeitlin
81a3763f80 don't compile this file at all in Motif2 build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 17:17:09 +00:00
Vadim Zeitlin
587c26c5e3 compilation fix for HP-UX (at least version 11)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 16:48:49 +00:00
Włodzimierz Skiba
46562151eb wxBrush::SetColour and wxPen::SetColour unified. Source cleaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 16:13:42 +00:00
Vadim Zeitlin
83dbeea988 first character of a command in a make rule must be TAB (not space or #): fixes build with HP-UX make
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 14:44:56 +00:00
Vadim Zeitlin
18fa735d20 reverted last (accidental) change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 12:53:25 +00:00
Vadim Zeitlin
89d90d6d87 fixed bug in error message given if X headers/libs not found
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 11:11:36 +00:00
Vadim Zeitlin
dd8df4fc9c updated version in configure to 2.7.0 too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35790 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 11:08:43 +00:00
Chris Elliott
0152ee89dd #if wxUSE_DEBUGREPORT seems Ok
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-04 08:08:11 +00:00
Vadim Zeitlin
94cf5fc723 escape underscores and don't use abbreviations in text
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 23:52:52 +00:00
Vadim Zeitlin
677856c9ef don't use %08p format string, gcc complains about it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 23:07:58 +00:00
Vadim Zeitlin
51e6392c54 regenerated after version.bkl changes fixing -compatibility_version for Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 23:06:16 +00:00
Vadim Zeitlin
a015d6943e added new files which were generated by bakefile but were not in cvs for some reason
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 21:08:10 +00:00
Vadim Zeitlin
4cbcfb73a0 regenerated after version.bkl changes fixing -compatibility_version for Darwin
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 21:05:25 +00:00
Vadim Zeitlin
6ce8b84846 offset version by 1 to avoid having compatibility_version of 0.0.0 under Darwin: this is forbidden
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 20:56:20 +00:00
Vadim Zeitlin
5c173ba3f7 transformed current/revision/age explanation comment into algorithmic form (from the original libtool rule-based one which was more suitable for Prolog interpreter than human beings...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 20:40:15 +00:00
Vadim Zeitlin
1c14217db4 added --without-subdirs option to speed up configure when you only need to build the main library
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 18:19:10 +00:00
Vadim Zeitlin
14ba002a91 added more methods to transparently convert wxTreeItemIdValue to wxTreeItemId to wxArrayTreeItemIds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35780 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 17:54:09 +00:00
Vadim Zeitlin
27a1fd5880 removed old commented out code and out of date comments
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 17:18:46 +00:00
Włodzimierz Skiba
550343399a Source cleaning. wxMotif/OS2 adjustements.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 16:39:45 +00:00
Chris Elliott
24d88d6d46 avoid trying to link QA if not required
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 15:59:02 +00:00
Chris Elliott
dc866dcabc update to 2.7 from 2.6
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35776 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 15:53:11 +00:00
Stefan Csomor
6e644ef2d3 avoid system pop-up menu commands being handled by wxApp, bug was shown in printing, using File->Print and changing Popup from 'Copies & Pages' to eg 'Layout'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35775 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-03 09:28:01 +00:00
Kevin Hock
4db6714b16 Code formatting cleanup from OSAF [ patch 1307563 ]
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35772 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-01 21:02:18 +00:00
Vadim Zeitlin
17f504ec9d fix the size of the created subbitmap
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-01 15:27:30 +00:00
David Elliott
0ee4059da2 Ran bakefile -f autoconf and autoconf.
Some missing headers have been added, the *NODOT variables were
added to samples makefiles and the version changed from 2.6.2 to 2.7.0.
Generated configure now includes "OS/2" fixes per wxAutohacks.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-10-01 03:42:14 +00:00
David Elliott
38c8fce8c4 Needed to add #include "wx/statusbr.h" to know that wxStatusBar is derived
from wxWindow for valid pointer comparison.
Went ahead and moved some includes into new ifndef WX_PRECOMP section to
improve compilation speed when using precompiled headers.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-30 16:39:41 +00:00
Mattia Barbon
51c9a5db64 Implemented wxMenuBar::Insert and wxMenu::Insert.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-30 09:15:52 +00:00
Mattia Barbon
eb9d223a9a Simplify preprocessor guards for render tables and new
font handling. Remove unused method.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-30 09:12:58 +00:00
Włodzimierz Skiba
712593b003 More ports in non autoconf formats.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-29 13:54:37 +00:00
Włodzimierz Skiba
dab6fbae46 Warning fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-29 12:34:47 +00:00
Włodzimierz Skiba
f1cf725509 [ 1307801 ] datectrl.cpp missing from mono project for WinCE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-29 10:28:48 +00:00
Włodzimierz Skiba
84882850e5 wxCheckListBox cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-29 10:00:16 +00:00
Jouk Jansen
c2b77b4301 Committing in .
Updated OpenVMS configuration

 Modified Files:
 	wxWidgets/setup.h_vms
 ----------------------------------------------------------------------


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-29 07:22:49 +00:00
Kevin Ollivier
82378a4f73 Move away from relative paths on Win, fix Unicode option, reinstate docs and demos building, and various tweaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-28 23:28:35 +00:00
Mattia Barbon
f94a81c084 Implement wxChoice::Insert.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-28 21:16:27 +00:00
Mattia Barbon
c228fcb438 Fix wxMotif checkbox for Motif 1.2. (need to backport)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35753 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-28 21:08:47 +00:00
Vadim Zeitlin
f15fa3a93f fix for a crash due to using NULL inputConv in Unicode build introduced in rev 1.162
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-28 09:41:55 +00:00
Vadim Zeitlin
43dc5fb140 wxGTK1 compilation fix after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-28 09:30:16 +00:00
Vadim Zeitlin
53a9325a43 don't include forward declarations in tags file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35749 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-28 09:24:51 +00:00
Michael Wetherell
312f1e6e37 Use the new wx_truncate_cast for any narrowing conversions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 21:45:48 +00:00
Włodzimierz Skiba
a0fe0a18e5 wxItemContainerImmutable::FindString unified.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35747 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 21:20:22 +00:00
Michael Wetherell
c14e2e9c8d Remove symbol versions now that we are on a new branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35746 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 19:29:46 +00:00
Michael Wetherell
30e1369517 Remove cast of hash value to unsigned long, hash value can be bigger
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 19:24:47 +00:00
Michael Wetherell
d8b6309bde Extend the hashmap tests to cover integer and pointer keys
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 19:11:38 +00:00
Michael Wetherell
bfe1edbddb Add hashes for long long keys
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35743 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 19:08:55 +00:00
Włodzimierz Skiba
11e62fe658 wxItemContainerImmutable::FindString unified.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 17:05:26 +00:00
Włodzimierz Skiba
853dcc57c6 wxItemContainerImmutable::FindString unified.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35741 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 16:54:43 +00:00
Włodzimierz Skiba
f7c40316d5 wxItemContainerImmutable::FindString unified.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 16:38:17 +00:00
Włodzimierz Skiba
e9efd3f5bd Fix for broken MSWUniv after wxABI_VERSION removal (otherwise wxQTMediaBackend::QTWndProc() breaks builds).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35739 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 16:23:25 +00:00
Vadim Zeitlin
a5f5f678f2 typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35738 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 15:46:24 +00:00
Vadim Zeitlin
ae199d6e4d yet more extra semicolons removed (patch 1305031)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 11:19:09 +00:00
Vadim Zeitlin
3ef092d63b (blind) fix for keyboard cues display under XP (bug 1298512)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35736 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-27 11:08:42 +00:00
Vadim Zeitlin
cd5b511a70 made Shift-JIS encoding upper case; made SJIS the canonical name for it (just because it's shorter and so will be less unweildy in directory names...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35735 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 22:13:41 +00:00
Vadim Zeitlin
c0f4a08e75 added directory with encoding-specific name to test recent enhancements to catalog-loading code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 21:25:26 +00:00
Vadim Zeitlin
79b4079ff4 fixed the sample to work with conforming C++ compiler: local struct can't reference enclosing function's locals
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35733 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 20:06:35 +00:00
Kevin Hock
ef86428624 In GetTextColour, use GetDefaultAttributes instead of ListView_GetTextColor because the latter seems to return black all the time (instead of the theme color)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 19:24:43 +00:00
David Elliott
3b60ea2f22 Make wxToolBar accept first mouse clicks. That is, clicking on a toolbar
tool when the window is inactive will both activate the window and cause
the tool to be clicked.
TODO: User should be provided a way to override this behavior.  The Apple HIG
are basically that "dangerous" tools (like delete) should not function
on an inactive window.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 16:20:57 +00:00
David Elliott
acb96ac277 Add EndDialog helper which calls EndModal with the given return code if the
dialog is modal, and Show(false) if the dialog is not modal.  This allows
the default handlers for OK and Cancel to function without assertions.
This code is copied more or less directly from src/msw/dialog.cpp.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 15:42:42 +00:00
Włodzimierz Skiba
38d4b1e4bc Warning fixes for BCC, VC, OW and MinGW.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35728 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 13:48:01 +00:00
Włodzimierz Skiba
812a5849e5 Default serting by name.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 13:43:21 +00:00
Włodzimierz Skiba
3452f00b56 MSWUniv build fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 13:37:07 +00:00
Włodzimierz Skiba
94c09a19ec Better fix for modal/modeless wizards.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 13:30:54 +00:00
Mart Raudsepp
dfdc483a23 Revert revision 1.102.2.2:
date: 2002/10/13 21:03:45;  author: RR;  state: Exp;  lines: +4 -2

  Combox gets its own SetFocus()
  wxDialog() set the focus to itself when shown. This will
    the propagate to some control in the dialog. I am not
    sure if this will override preceding user's call to
    SetFocus() in one of the child windows.
=========================
It will override preceding users call to SetFocus, effectively introducing bug #1288889 (wxWindow::SetFocus does not
work on modal dialogs, and therefore wxButton::SetDefault does not work either). Reverting fixes that. Need to
investigate why it was needed in relation to Comboboxes, but SetFocus/SetDefault breakage is worser imho, hence the
revert for now.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 12:53:29 +00:00
Vadim Zeitlin
766a1d00c3 corrected #ifdef order (might help linking with wxUSE_MEMORY_TRACING==1)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 12:39:55 +00:00
Vadim Zeitlin
905a5e7f7c fixed function declaration in wxFORCE_LINK_MODULE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35722 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 12:29:25 +00:00
Vadim Zeitlin
f36086d185 reset libtool version for new branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 09:02:24 +00:00
Vadim Zeitlin
151815eb93 added comment about things to update in version.bkl when changing the version
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35720 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 08:59:51 +00:00
Włodzimierz Skiba
65e324b4b0 Root for OS2 - feedback from openwatcom newsgroups.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35719 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 08:44:35 +00:00
Stefan Csomor
ff23892253 fixing focus handling for generic controls in carbon-cfm
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 04:55:02 +00:00
Vadim Zeitlin
d1f024a8de fixed wide char codeset detection for systems which do support LE/BE variants (broken by recent commit)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35716 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 01:02:14 +00:00
Vadim Zeitlin
c2b83fddb9 added tracing code to wide char codeset detection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 00:53:00 +00:00
Vadim Zeitlin
2fb18bf45b use wxIsNullDouble instead of comparing m_ration with 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35714 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 00:31:47 +00:00
Vadim Zeitlin
4e115ed2c7 fixed variable shadowing icc warnings
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 00:29:42 +00:00
Vadim Zeitlin
8226a05440 fixed warnings about truncating 64 bit integers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-26 00:21:03 +00:00
Vadim Zeitlin
67036b2497 added wxIsNullDouble()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35711 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 23:58:29 +00:00
Vadim Zeitlin
ec52467188 fixed warnings about truncating 64 bit integers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 23:57:38 +00:00
Vadim Zeitlin
2cfcf22d47 added pragmas to disable icc warning when va_arg is used with a pointer type
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35709 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 23:38:54 +00:00
Vadim Zeitlin
9f542367b7 fixed warnings about pointer to integer cast
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 23:36:10 +00:00
Vadim Zeitlin
3e8adad7d7 fix icc warning about printf() format mismatch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 23:30:08 +00:00
Vadim Zeitlin
28c91b7deb removed more extraneous semicolons
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35706 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 23:28:04 +00:00
Vadim Zeitlin
c77a67962c use wxIsSameDouble() and wxIsNullDouble() for warning-less double comparison of doubles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 23:27:27 +00:00
Vadim Zeitlin
f1afd2e066 fix hiding a local variable by another one in the inner scope
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35704 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 22:51:07 +00:00
Vadim Zeitlin
b80388aab6 don't use deprecated cast operator to wxList&
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 22:50:26 +00:00
Vadim Zeitlin
123dca7d25 don't declare pthread_mutexattr_settype() ourselves if the system already does it, we might have a slightly different declaration and this causes problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35702 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 22:48:06 +00:00
Vadim Zeitlin
fdda7199e8 don't declare strptime() ourselves if the system already does it, we might have a slightly different declaration and this causes problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35701 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 22:42:43 +00:00
Vadim Zeitlin
7f47faf4f2 disable warning about data truncation (810) for icc (this is a useful warning and might be reenabled later but for now there are simply too many of them...)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 22:35:48 +00:00
Vadim Zeitlin
f536f00539 don't declare strptime() ourselves if the system already does it, we might have a slightly different declaration and this causes problems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 22:34:03 +00:00
Michael Wetherell
20ceebaa87 Fixes for include guards, patch 1256967 Paul Cornett
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:49:40 +00:00
Vadim Zeitlin
c88c6e94c0 fixed a signed/unsigned comparison warning introudced by last warning fix...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:45:25 +00:00
Vadim Zeitlin
9000cdfb2a don't use deprecated conversion operator in wxVariantDataList
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:45:02 +00:00
Vadim Zeitlin
4e47fd5a1b replaced gs_menuItems hack with a wxOwnerDrawn::m_isMenuItem field
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35695 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:43:35 +00:00
Vadim Zeitlin
81f6ea4a29 removed #errors in 2.7 compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:39:23 +00:00
Vadim Zeitlin
53c5fb20ed enable new font handling (working for i18n applications) by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:35:11 +00:00
Vadim Zeitlin
02bcd285fa re-renamed DoCreate() to XmDoCreateTLW() to avoid virtual function hiding in other classes with their own DoCreate() and re-removed DoDestroy()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:29:58 +00:00
Vadim Zeitlin
48f625bc2c corrected typo in check for icc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:25:33 +00:00
Vadim Zeitlin
84006e65e8 removed wxABI_VERSION checks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:23:30 +00:00
Vadim Zeitlin
c6ece59558 added and documented SetEscapeId()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 20:17:01 +00:00
Vadim Zeitlin
17a1ebd101 first round of Intel compiler warning fixes: down from a few thousands just to slightly more than 100
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 19:59:19 +00:00
Vadim Zeitlin
bd090f77ee position is always unsigned in InsetPage(), no need to compare it with 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 19:08:36 +00:00
Vadim Zeitlin
df6ddd9730 fix after adding wxFORCE_LINK_MODULE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35686 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 18:46:14 +00:00
Vadim Zeitlin
bc14c8b21f added wxIsSameDouble() which wraps double comparison in a pragmas disabling icc warning about it
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 18:14:53 +00:00
Vadim Zeitlin
6cf2fb76fe added wxFORCE_LINK_MODULE public macro which can now be used outside of wxHTML too; modified it to not provoke icc warnings when used
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35684 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 18:09:26 +00:00
Vadim Zeitlin
7a7bd38a77 fixed two icc warnings about local variables hiding parameters
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35683 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 16:19:02 +00:00
Stefan Neis
8a077f2872 Applied [ 1186782 ] Setting thread stack size on Unix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35682 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 16:12:18 +00:00
Vadim Zeitlin
ab0ad5f175 add Intel compiler detection
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 14:31:09 +00:00
Mattia Barbon
3b96fc2f1b Trace module initialization and cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 14:26:38 +00:00
Mattia Barbon
f499ca450c Remove now unused header. Forward declaration is enough for wxBookCtrl and wxNotebook.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 14:24:00 +00:00
Mattia Barbon
33d094d13b Make member variable private.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35678 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 14:22:16 +00:00
Michael Wetherell
588c80dea1 Ambiguous overload fix for gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 13:02:27 +00:00
Michael Wetherell
2e2a55b22e Compile fixes for the const patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 12:53:28 +00:00
Vadim Zeitlin
9864ef3b5c fix for library order when using wx-dependent libraries (part of patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:21:48 +00:00
Vadim Zeitlin
61a15bac86 don't put odbc lib twice in the generated makefile (part of patch 1303833)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35674 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:19:39 +00:00
Vadim Zeitlin
259c43f679 more extra semicolons removed (patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35673 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:16:57 +00:00
Vadim Zeitlin
c7fe80e285 Mac compilation fix after const patch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 11:06:02 +00:00
Michael Wetherell
f6551618d4 Fix for crash in ~wxWindow() on solaris
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 07:17:31 +00:00
Michael Wetherell
5001df0dd5 Fixups for solaris; remove '-mt' from pkg-config output and add '-lX11' for a static build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35670 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-25 07:12:02 +00:00
Vadim Zeitlin
42d0df0030 wxLaunchDefaultBrowser() now supports wxBROWSER_NEW_WINDOW flag (and it actually works correctly, too)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 23:56:34 +00:00
Vadim Zeitlin
7999124f55 fix wxExecute() return code checks and removed not working code to open URLs in new window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 23:28:26 +00:00
Vadim Zeitlin
d1e4a8182e make WinStruct<> available in non-GUI code too
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35667 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 23:08:53 +00:00
Vadim Zeitlin
976abb72fc set error to GSOCK_TIMEOUT if the socket timed out (modified and extended patch 1303554)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35666 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 22:31:55 +00:00
Vadim Zeitlin
fbfb8bcc3f added missing consts and pass objects by const reference instead of by value (patch 1205869)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35665 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:43:15 +00:00
Vadim Zeitlin
68bc51a9ed missing const added (patch 1295036)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:28:15 +00:00
Vadim Zeitlin
e1cffcd6e3 don't set focus to a hidden notebook (patch 1299005)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35663 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:22:28 +00:00
Vadim Zeitlin
a5924a7a35 update for 2.6.2 (patch 1294900)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35662 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 21:15:02 +00:00
Vadim Zeitlin
af1f0a7631 made absence of wxCHANGE_DIR flag work even under NT (slightly modified patch 1299298)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 20:38:50 +00:00
Vadim Zeitlin
4115960d4b remove extraneous semicolons (patch 1299687)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 20:29:22 +00:00
Vadim Zeitlin
254e8e2913 removed code defining NO_GCC_PRAGMA, we shouldn't need it any longer (alternatively, if user code requires it, we should always define it, but we still don't need any tests in configure)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35659 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 11:25:07 +00:00
Kevin Hock
6459a506bb Use CXXFLAGS rather than CFLAGS for -Werror when determining type of socket function parameter (socklen_t vs. int) so that OS X 10.2 will correctly determine the parameter as an int; using -Werror forces the warnings thrown when attempting size_t to make configure fall back to int.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35658 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 04:38:57 +00:00
Michael Wetherell
156162ece8 Memory corruption fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 00:16:56 +00:00
Michael Wetherell
09f1d340c1 Hopefully this adds the msdos files to the wxBase zip
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35655 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-24 00:11:50 +00:00
Mart Raudsepp
b323fb0b8f Remove instruction to define NO_GCC_PRAGMA when compiling with gcc using Makefiles on Windows from
docs/msw/install.txt


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35654 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 17:18:46 +00:00
David Elliott
9de6df963d As of src/common/framecmn.cpp revision 1.60 the wxFrameBase::CreateToolBar
method now uses SetToolBar rather than updating m_frameToolBar directly.
Therefore, we no longer need to duplicate the code from SetToolBar in
CreateToolBar.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35653 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 16:02:22 +00:00
David Elliott
c05e07cb8c Added Cocoa_acceptsFirstMouse.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35652 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 15:27:42 +00:00
David Elliott
3d012d1bf1 Added Cocoa_canBecomeKeyWindow.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35651 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 15:24:29 +00:00
Mart Raudsepp
8907154c1a Nuke #pragma implementation/interface's
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 12:56:45 +00:00
Kevin Ollivier
919de94c4f Fixed unicode support and introduced a debug flag.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-23 05:13:28 +00:00
Michael Wetherell
2b5e2b5847 Fix for 'make dist' to include headers for all ports
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35647 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 16:22:31 +00:00
Vadim Zeitlin
cae8f1bf03 Unicode build fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35646 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 13:43:08 +00:00
Vadim Zeitlin
422e411e95 gcc compilation fixes after last commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35645 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 12:48:07 +00:00
Vadim Zeitlin
74a7eb0bf6 try all known UCS-[24] synonyms in wxMBConv_iconv, this should fix this class on IRIX (where UCS-4 is supported but neither UCS-4[LB]E nor UCS4, which were the only ones we tested, are not)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 12:36:17 +00:00
Vadim Zeitlin
37d0e9f603 more synonyms for UCS-2/4
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 11:26:49 +00:00
Vadim Zeitlin
de9a407728 warning about standard controls
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35642 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-22 09:59:57 +00:00
Julian Smart
d1fd98ccd8 Don't skip after writing tab or we could get another one in some circumstances
(when top parent is frame)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-21 22:09:23 +00:00
Vadim Zeitlin
421d214fa9 converted XPMs to Unix EOLs, otherwise some Unix compilers don't like them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-21 15:41:43 +00:00
Włodzimierz Skiba
d48ba93329 Wrong flag correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-21 10:32:41 +00:00
Mart Raudsepp
ef1a9be407 [wxGTK] Remove wxTLW::RequestUserAttention related backwards compatibility hacks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35637 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-21 07:04:58 +00:00
Kevin Ollivier
fc87210f7d Removing hardcoded ansi and 2.3 support for Mac build scripts.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-21 04:43:48 +00:00
Kevin Ollivier
ae4e0c7a5c Fix an issue where dist may actually be created as a file rather than a directory.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35635 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-21 04:37:32 +00:00
Vadim Zeitlin
66c05fa96b and restored error checking too: this completes sequence of 3 check ins making wx-config work on systems with Bourne shell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 23:09:36 +00:00
Vadim Zeitlin
ea4806251e better (i.e. actually working) fix for the problem on systems where /bin/sh is a Bourne shell
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35633 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 23:01:01 +00:00
Vadim Zeitlin
57764418a4 made wx-config work in place on systems where /bin/sh is a Bourne shell (such as IRIX)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 22:39:34 +00:00
Vadim Zeitlin
7615dee740 fix SGI CC warning about last parameter of vararg function being unnamed in release build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35631 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 22:21:20 +00:00
Vadim Zeitlin
9ffaedfcd0 don't define constants unused in release build (SGI CC warning)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 22:17:40 +00:00
David Elliott
9a7247f0e9 Call [super dealloc] from overridden dealloc methods.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35629 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 21:19:25 +00:00
Vadim Zeitlin
219ee9ba9d really fix binary backwards compatibility for wxMotif
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 20:33:47 +00:00
David Elliott
0c7ca81c4f Added simple instructions and autogen.mk to rebuild configure script.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35626 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 17:34:28 +00:00
Stefan Csomor
cff83174db adding missing file
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35625 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 15:19:27 +00:00
Julian Smart
2ee70736f5 Fixed typo
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35624 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 15:18:55 +00:00
Stefan Csomor
a0845d4583 moving libiconv and libz into linker flags, as Xcode resolves the links otherwise into fixed references at compile time...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35623 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 15:16:47 +00:00
Julian Smart
43907f570d Added aclocal files to make_dist.mk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35622 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 15:04:10 +00:00
Julian Smart
5863d5e6d0 Tweak
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 14:12:57 +00:00
Julian Smart
84bdefa021 Added aclocal directory
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 14:10:19 +00:00
Włodzimierz Skiba
6334d81fe3 Polish translation update.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35619 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 13:54:38 +00:00
Julian Smart
168e7d95ea Changed date
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35618 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 12:08:32 +00:00
Michael Wetherell
34a35823ea Fix wxGTK crash on startup on 64-bit solaris 10
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35617 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 12:01:54 +00:00
Julian Smart
fdd2ec3e96 Docmented IsModal change
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 11:28:22 +00:00
Julian Smart
10e0e1beb1 Don't assert if the window doesn't accept the focus.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 11:18:04 +00:00
Julian Smart
285ce5a341 IsModal now has the newer meaning.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35614 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 11:03:49 +00:00
Mart Raudsepp
4bbc4bded5 Document wxDirDialog styles
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 10:57:33 +00:00
Julian Smart
b7e22e3d27 Removed unnecessary IsModal call
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 10:06:58 +00:00
Julian Smart
e95b8d5a8c IsModal() now has the newer meaning (equivalent of old IsModalShowing())
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35611 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 10:05:46 +00:00
Vadim Zeitlin
7682e22edb blind compilation fix for cygwin Unicode build (bug 1296144)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35610 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 09:52:14 +00:00
Julian Smart
c25ac78a9f Added commented-out IPC_SERVICE for easier testing
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35609 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 09:12:14 +00:00
Julian Smart
57d9fc8522 Updated FAQ from web files
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35608 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 09:09:20 +00:00
Kevin Ollivier
f58a6c817e Some automated build scripts that wrap Robin's and make it easier to build installers (without having access to his R-bot build network:).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35606 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-20 01:56:22 +00:00
Vadim Zeitlin
608a34bf5b only call fsync() on disk files, otherwise we get an error for pipes under Unix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35605 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 23:34:07 +00:00
Włodzimierz Skiba
94dadb0a8e angle bracket problem fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35604 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 22:32:30 +00:00
Michael Wetherell
6f9cf1e6bd Regenerated after the lib64, lib/64 changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 20:48:59 +00:00
Michael Wetherell
c5b6251927 Revert previous commit for fear that 'test -h' may not work everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 20:16:19 +00:00
Michael Wetherell
0feb044436 Allow WX_PATH_FIND_INCLUDES and WX_PATH_FIND_LIBRARIES to accept symlinks
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35601 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 19:57:41 +00:00
Michael Wetherell
c5044ee808 Change so that WX_PATH_FIND_LIBRARIES doesn't always check /usr/lib, /usr/lib32, /usr/lib/64 and /usr/lib64
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 19:50:01 +00:00
Michael Wetherell
0aaa804e70 Use lib64 for 64-bit builds on some kinds of linux and lib/64 on solaris
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 19:45:41 +00:00
Michael Wetherell
214774ceeb Fix for detection of motif in the default library path
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35598 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 18:41:41 +00:00
Julian Smart
37f6a080f4 Fix for modal/modeless wizards
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 15:34:56 +00:00
Julian Smart
a36876368a Missing end of comment
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35596 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 15:18:27 +00:00
Kevin Hock
0d34c30e55 Make sure Enable_Events is called when a connection is immediately established (such as when using domain sockets for IPC). Fixes bug 1195700
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 14:56:50 +00:00
Vadim Zeitlin
783e0c6d48 temporarily reverted binary backwards incompatible DoCreate to XmDoCreateTLW renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35594 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 12:46:30 +00:00
Mart Raudsepp
f69e752c86 Fix "Error: Curly braces do not match inside file fontmap.tex"
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 11:38:37 +00:00
Vadim Zeitlin
e6b915ed4f temporarily reverted binary backwards incompatible DoCreate to XmDoCreateTLW renaming
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 10:36:18 +00:00
Vadim Zeitlin
c687b303a5 only check for lib directory for architectures which have multiple ABIs (Solaris, IRIX, Linux)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 10:28:55 +00:00
Ron Lee
7ea07c5342 Applied peer reviewed translation from:
http://bugs.debian.org/328966

Does not include fuzzy merge from current head, they are plainly wrong
(even to me) and will need another cycle of manual review.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 01:54:57 +00:00
Vadim Zeitlin
7b94a67c64 fix to last commit: extra parentheses removed
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35589 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 00:54:41 +00:00
Vadim Zeitlin
f6b50c59ab fix for creation of shared libraries under AIX with gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35588 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 00:32:03 +00:00
Vadim Zeitlin
4171f4c13d fix for creation of shared libraries under AIX with gcc
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-19 00:26:53 +00:00
Vadim Zeitlin
420de418ea workaround for buggy setlocale() under AIX (without this wxLocale didn't work at all)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 23:38:06 +00:00
Stefan Neis
c90c34007a Added (dummy) handler for loading bitmap from file instead of resource.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35585 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 23:27:28 +00:00
Vadim Zeitlin
fa4bc07cce documented GetAllEncodingNames
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35584 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 23:04:48 +00:00
Vadim Zeitlin
6b91d11340 condensed 2 very similar trace messages into one
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35583 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 23:04:11 +00:00
Vadim Zeitlin
3f68727513 added ifconfig and ping locations for AIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35582 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 23:00:00 +00:00
Mattia Barbon
b3090d48b4 Send wxInitDialogEvent under wxMotif.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 22:48:51 +00:00
Vadim Zeitlin
40711af81b Unicode compilation fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35580 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 20:12:52 +00:00
Vadim Zeitlin
09d2016d9d GetSystemEncodingName() cleanup: we don't need to check for US-ASCII synonyms here any more, wxFontMapper::GetEncodingFromName() knows about them
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35579 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 20:09:51 +00:00
Vadim Zeitlin
3f0785cd6b add CP-xxx as synonyms for WINDOWS-xxx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35578 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 20:08:17 +00:00
Vadim Zeitlin
ca6a9a1486 look in codeset-specific directory for locale files first, then fallback to the one without codeset
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 19:49:28 +00:00
Vadim Zeitlin
761952d9cb more encoding names for AIX/Solaris/IRIX
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 19:27:23 +00:00
Stefan Csomor
b13095df45 tentative fix for BestSize problems (non-native toolbar)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 19:13:27 +00:00
Stefan Csomor
363f7643a6 tentative fix for BestSize problems (non-native toolbar)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35574 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 19:08:15 +00:00
Vadim Zeitlin
0944fceb98 don't pass NULL pointer to printf(), this crashes Solaris printf
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 16:50:47 +00:00
Vadim Zeitlin
35d10652f4 don't create conversion objects unless we really need to convert
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 16:41:22 +00:00
Vadim Zeitlin
ce6f8d6fb3 added trace message to wxCSConv creation code
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 16:40:24 +00:00
Vadim Zeitlin
7cb0687287 avoid unnecessary conversions when loading the catalog (i.e. if the catalog encoding is the same as the currently used one)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 14:48:17 +00:00
Vadim Zeitlin
6ba5438dda compate charset names case-insensitively in GetEncodingFromName()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 14:46:41 +00:00
Vadim Zeitlin
0586024f65 signed/unsigned comparison warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 14:23:05 +00:00
Vadim Zeitlin
3f97d339d6 removed unused variable
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35567 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 14:11:14 +00:00
Vadim Zeitlin
8b3eb85d5e added GetAllEncodingNames(), use it to select the correct encoding name to pass to iconv_open()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35566 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 14:01:14 +00:00
Vadim Zeitlin
0ad5d837cb regenerated after latest changes: alternative standard library directory name support; SGI CC dependencies; ...
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 13:32:10 +00:00
Julian Smart
36afbc42f8 Corrected behaviour for modeless wizards -- can't detect modal/modeless
state after EndModal is called. Future API might incorporate modal flag
so wxWizard can do the right thing.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35564 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-09-18 13:31:50 +00:00
8598 changed files with 159010 additions and 3068382 deletions

View File

@@ -1,78 +0,0 @@
system.list
bin
.gdb_history
Test
config.cache
configarg.cache
config.status
system.list
linux.system.cache
wx-config
config.log
linux-gnu.system.cache
*.dsp
*.dsw
*.plg
*.opt
*.aps
*.ncb
*.pro
*.opt
*.d
*.swp
*.swo
*.vcp
*.vcw
Release
Debug
ReleaseUnicode
DebugUnicode
ReleaseUnicodeARM
DebugUnicodeARM
ReleaseUnicodeMIPS
DebugUnicodeMIPS
ReleaseUnicodeSH3
DebugUnicodeSH3
ReleaseUnicodeX86
DebugUnicodeX86
ReleaseUnicodeX86EM
DebugUnicodeX86EM
ReleaseDLL
DebugDLL
ReleaseUnicodeDLL
DebugUnicodeDLL
UnivRelease
UnivDebug
BaseRelease
BaseDebug
BaseReleaseDLL
BaseDebugDLL
build-debug
robert
stamp-h.in
Makefile
setup.h
stamp-h
libtool
base
gtk
gtk2
motif
win32
x11
univ
univ-debug
univ-release
base-debug
gtk-debug
motif-debug
win32-debug
base-release
gtk-release
motif-release
win32-release
*tags
log
univtags.cmd
.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.

25368
Makefile.in

File diff suppressed because it is too large Load Diff

View File

@@ -1,742 +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 WX_PATH_FIND_LIBRARIES helper
dnl ---------------------------------------------------------------------------
AC_DEFUN([WX_PATH_FIND_LIBRARIES_IN_PATH],
[
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 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],
[
WX_PATH_FIND_LIBRARIES_IN_PATH($1, $2)
if test "x$ac_find_libraries" = "x" ; then
WX_PATH_FIND_LIBRARIES_IN_PATH(WX_STD_LIBPATH(), $2)
if test "x$ac_find_libraries" != "x" ; then
ac_find_libraries="default location"
fi
fi
])
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)
AC_DEFUN([WX_ARG_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'
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
])

2379
aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

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.",
".++++++++++++. ..............",
".++++++++++++. ",
".............. ",
" ",
" ",
" ",
" ",
" "};

View File

@@ -1,820 +0,0 @@
dnl ### begin block 00_header[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
dnl
dnl This macro was generated by
dnl Bakefile 0.1.9 (http://bakefile.sourceforge.net)
dnl Do not modify, all changes will be overwritten!
BAKEFILE_AUTOCONF_INC_M4_VERSION="0.1.9"
dnl ### begin block 10_AC_BAKEFILE_PRECOMP_HEADERS[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
AC_BAKEFILE_PRECOMP_HEADERS
dnl ### begin block 20_COND_BUILD_DEBUG[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_DEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_DEBUG=""
fi
AC_SUBST(COND_BUILD_DEBUG)
dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
fi
AC_SUBST(COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT)
dnl ### begin block 20_COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
fi
AC_SUBST(COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT)
dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_DEBUG_UNICODE_0="#"
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
COND_BUILD_DEBUG_UNICODE_0=""
fi
AC_SUBST(COND_BUILD_DEBUG_UNICODE_0)
dnl ### begin block 20_COND_BUILD_DEBUG_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_DEBUG_UNICODE_1="#"
if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
COND_BUILD_DEBUG_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_DEBUG_UNICODE_1)
dnl ### begin block 20_COND_BUILD_RELEASE[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_RELEASE="#"
if test "x$BUILD" = "xrelease" ; then
COND_BUILD_RELEASE=""
fi
AC_SUBST(COND_BUILD_RELEASE)
dnl ### begin block 20_COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
fi
AC_SUBST(COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT)
dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_RELEASE_UNICODE_0="#"
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
COND_BUILD_RELEASE_UNICODE_0=""
fi
AC_SUBST(COND_BUILD_RELEASE_UNICODE_0)
dnl ### begin block 20_COND_BUILD_RELEASE_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_BUILD_RELEASE_UNICODE_1="#"
if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
COND_BUILD_RELEASE_UNICODE_1=""
fi
AC_SUBST(COND_BUILD_RELEASE_UNICODE_1)
dnl ### begin block 20_COND_DEBUG_FLAG_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_FLAG_1="#"
if test "x$DEBUG_FLAG" = "x1" ; then
COND_DEBUG_FLAG_1=""
fi
AC_SUBST(COND_DEBUG_FLAG_1)
dnl ### begin block 20_COND_DEBUG_INFO_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_INFO_0="#"
if test "x$DEBUG_INFO" = "x0" ; then
COND_DEBUG_INFO_0=""
fi
AC_SUBST(COND_DEBUG_INFO_0)
dnl ### begin block 20_COND_DEBUG_INFO_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEBUG_INFO_1="#"
if test "x$DEBUG_INFO" = "x1" ; then
COND_DEBUG_INFO_1=""
fi
AC_SUBST(COND_DEBUG_INFO_1)
dnl ### begin block 20_COND_DEPS_TRACKING_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEPS_TRACKING_0="#"
if test "x$DEPS_TRACKING" = "x0" ; then
COND_DEPS_TRACKING_0=""
fi
AC_SUBST(COND_DEPS_TRACKING_0)
dnl ### begin block 20_COND_DEPS_TRACKING_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/demos.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/html_samples.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/mobile_samples.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/opengl_samples.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/utils.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_DEPS_TRACKING_1="#"
if test "x$DEPS_TRACKING" = "x1" ; then
COND_DEPS_TRACKING_1=""
fi
AC_SUBST(COND_DEPS_TRACKING_1)
dnl ### begin block 20_COND_GCC_PCH_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/svg/svg.bkl,../../tests/test.bkl,wx.bkl] ###
COND_GCC_PCH_1="#"
if test "x$GCC_PCH" = "x1" ; then
COND_GCC_PCH_1=""
fi
AC_SUBST(COND_GCC_PCH_1)
dnl ### begin block 20_COND_MONOLITHIC_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0="#"
if test "x$MONOLITHIC" = "x0" ; then
COND_MONOLITHIC_0=""
fi
AC_SUBST(COND_MONOLITHIC_0)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" ; then
COND_MONOLITHIC_0_SHARED_0=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_HTML" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_0_USE_XRC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_0_USE_XRC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_HTML" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_SHARED_1_USE_XRC_1[wx.bkl] ###
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_SHARED_1_USE_XRC_1)
dnl ### begin block 20_COND_MONOLITHIC_0_USE_ODBC_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_0_USE_ODBC_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then
COND_MONOLITHIC_0_USE_ODBC_1=""
fi
AC_SUBST(COND_MONOLITHIC_0_USE_ODBC_1)
dnl ### begin block 20_COND_MONOLITHIC_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_MONOLITHIC_1="#"
if test "x$MONOLITHIC" = "x1" ; then
COND_MONOLITHIC_1=""
fi
AC_SUBST(COND_MONOLITHIC_1)
dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_0[wx.bkl] ###
COND_MONOLITHIC_1_SHARED_0="#"
if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x0" ; then
COND_MONOLITHIC_1_SHARED_0=""
fi
AC_SUBST(COND_MONOLITHIC_1_SHARED_0)
dnl ### begin block 20_COND_MONOLITHIC_1_SHARED_1[wx.bkl] ###
COND_MONOLITHIC_1_SHARED_1="#"
if test "x$MONOLITHIC" = "x1" -a "x$SHARED" = "x1" ; then
COND_MONOLITHIC_1_SHARED_1=""
fi
AC_SUBST(COND_MONOLITHIC_1_SHARED_1)
dnl ### begin block 20_COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1)
dnl ### begin block 20_COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1="#"
if test "x$OFFICIAL_BUILD" = "x1" -a "x$PLATFORM_WIN32" = "x1" ; then
COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERCYGWIN" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_0_USE_SOVERSION_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x0" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_0_USE_SOVERSION_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MACOSX_1="#"
if test "x$PLATFORM_MACOSX" = "x1" ; then
COND_PLATFORM_MACOSX_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_GTK[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_GTK)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_TOOLKIT_X11[wx.bkl] ###
COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_TOOLKIT_X11)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_MACOSX_1_USE_SOVERSION_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
fi
AC_SUBST(COND_PLATFORM_MACOSX_1_USE_SOVERSION_1)
dnl ### begin block 20_COND_PLATFORM_MACOS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MACOS_1="#"
if test "x$PLATFORM_MACOS" = "x1" ; then
COND_PLATFORM_MACOS_1=""
fi
AC_SUBST(COND_PLATFORM_MACOS_1)
dnl ### begin block 20_COND_PLATFORM_MAC_1[../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl] ###
COND_PLATFORM_MAC_1="#"
if test "x$PLATFORM_MAC" = "x1" ; then
COND_PLATFORM_MAC_1=""
fi
AC_SUBST(COND_PLATFORM_MAC_1)
dnl ### begin block 20_COND_PLATFORM_MSDOS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_MSDOS_1="#"
if test "x$PLATFORM_MSDOS" = "x1" ; then
COND_PLATFORM_MSDOS_1=""
fi
AC_SUBST(COND_PLATFORM_MSDOS_1)
dnl ### begin block 20_COND_PLATFORM_OS2_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_OS2_1="#"
if test "x$PLATFORM_OS2" = "x1" ; then
COND_PLATFORM_OS2_1=""
fi
AC_SUBST(COND_PLATFORM_OS2_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_UNIX_0="#"
if test "x$PLATFORM_UNIX" = "x0" ; then
COND_PLATFORM_UNIX_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_0)
dnl ### begin block 20_COND_PLATFORM_UNIX_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_UNIX_1="#"
if test "x$PLATFORM_UNIX" = "x1" ; then
COND_PLATFORM_UNIX_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_GUI_1[wx.bkl] ###
COND_PLATFORM_UNIX_1_USE_GUI_1="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_UNIX_1_USE_GUI_1=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_USE_GUI_1)
dnl ### begin block 20_COND_PLATFORM_UNIX_1_USE_PLUGINS_0[wx.bkl] ###
COND_PLATFORM_UNIX_1_USE_PLUGINS_0="#"
if test "x$PLATFORM_UNIX" = "x1" -a "x$USE_PLUGINS" = "x0" ; then
COND_PLATFORM_UNIX_1_USE_PLUGINS_0=""
fi
AC_SUBST(COND_PLATFORM_UNIX_1_USE_PLUGINS_0)
dnl ### begin block 20_COND_PLATFORM_WIN32_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_WIN32_0="#"
if test "x$PLATFORM_WIN32" = "x0" ; then
COND_PLATFORM_WIN32_0=""
fi
AC_SUBST(COND_PLATFORM_WIN32_0)
dnl ### begin block 20_COND_PLATFORM_WIN32_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_PLATFORM_WIN32_1="#"
if test "x$PLATFORM_WIN32" = "x1" ; then
COND_PLATFORM_WIN32_1=""
fi
AC_SUBST(COND_PLATFORM_WIN32_1)
dnl ### begin block 20_COND_SHARED_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_SHARED_0="#"
if test "x$SHARED" = "x0" ; then
COND_SHARED_0=""
fi
AC_SUBST(COND_SHARED_0)
dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
fi
AC_SUBST(COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0)
dnl ### begin block 20_COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
fi
AC_SUBST(COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0)
dnl ### begin block 20_COND_SHARED_0_TOOLKIT_PM_WXUNIV_0[../../samples/dialogs/dialogs.bkl] ###
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
fi
AC_SUBST(COND_SHARED_0_TOOLKIT_PM_WXUNIV_0)
dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_USE_OPENGL_1)
dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[wx.bkl] ###
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[wx.bkl] ###
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 20_COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[wx.bkl] ###
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 20_COND_SHARED_0_USE_XRC_1[../../contrib/build/gizmos/gizmos.bkl] ###
COND_SHARED_0_USE_XRC_1="#"
if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then
COND_SHARED_0_USE_XRC_1=""
fi
AC_SUBST(COND_SHARED_0_USE_XRC_1)
dnl ### begin block 20_COND_SHARED_0_WXUSE_EXPAT_BUILTIN[wx.bkl] ###
COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_EXPAT_BUILTIN)
dnl ### begin block 20_COND_SHARED_0_WXUSE_ODBC_BUILTIN[wx.bkl] ###
COND_SHARED_0_WXUSE_ODBC_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_ODBC_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_ODBC_BUILTIN)
dnl ### begin block 20_COND_SHARED_0_WXUSE_REGEX_BUILTIN[wx.bkl] ###
COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_REGEX_BUILTIN)
dnl ### begin block 20_COND_SHARED_0_WXUSE_ZLIB_BUILTIN[wx.bkl] ###
COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
fi
AC_SUBST(COND_SHARED_0_WXUSE_ZLIB_BUILTIN)
dnl ### begin block 20_COND_SHARED_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_SHARED_1="#"
if test "x$SHARED" = "x1" ; then
COND_SHARED_1=""
fi
AC_SUBST(COND_SHARED_1)
dnl ### begin block 20_COND_SHARED_1_USE_GUI_1_USE_OPENGL_1[wx.bkl] ###
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1=""
fi
AC_SUBST(COND_SHARED_1_USE_GUI_1_USE_OPENGL_1)
dnl ### begin block 20_COND_SHARED_1_USE_XRC_1[../../contrib/build/gizmos/gizmos.bkl] ###
COND_SHARED_1_USE_XRC_1="#"
if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then
COND_SHARED_1_USE_XRC_1=""
fi
AC_SUBST(COND_SHARED_1_USE_XRC_1)
dnl ### begin block 20_COND_TOOLKIT_[wx.bkl] ###
COND_TOOLKIT_="#"
if test "x$TOOLKIT" = "x" ; then
COND_TOOLKIT_=""
fi
AC_SUBST(COND_TOOLKIT_)
dnl ### begin block 20_COND_TOOLKIT_COCOA[../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,wx.bkl] ###
COND_TOOLKIT_COCOA="#"
if test "x$TOOLKIT" = "xCOCOA" ; then
COND_TOOLKIT_COCOA=""
fi
AC_SUBST(COND_TOOLKIT_COCOA)
dnl ### begin block 20_COND_TOOLKIT_COCOA_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_COCOA_USE_GUI_1="#"
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_COCOA_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xCOCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_GTK[wx.bkl] ###
COND_TOOLKIT_GTK="#"
if test "x$TOOLKIT" = "xGTK" ; then
COND_TOOLKIT_GTK=""
fi
AC_SUBST(COND_TOOLKIT_GTK)
dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_GTK_USE_GUI_1="#"
if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_GTK_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xGTK" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MAC[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_TOOLKIT_MAC="#"
if test "x$TOOLKIT" = "xMAC" ; then
COND_TOOLKIT_MAC=""
fi
AC_SUBST(COND_TOOLKIT_MAC)
dnl ### begin block 20_COND_TOOLKIT_MAC_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_MAC_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MAC_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MGL[wx.bkl] ###
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=""
fi
AC_SUBST(COND_TOOLKIT_MGL)
dnl ### begin block 20_COND_TOOLKIT_MGL_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_MGL_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMGL" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MGL_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MGL_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MOTIF[wx.bkl] ###
COND_TOOLKIT_MOTIF="#"
if test "x$TOOLKIT" = "xMOTIF" ; then
COND_TOOLKIT_MOTIF=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF)
dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_MOTIF_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMOTIF" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_MSW[wx.bkl] ###
COND_TOOLKIT_MSW="#"
if test "x$TOOLKIT" = "xMSW" ; then
COND_TOOLKIT_MSW=""
fi
AC_SUBST(COND_TOOLKIT_MSW)
dnl ### begin block 20_COND_TOOLKIT_MSW_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_MSW_USE_GUI_1="#"
if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_MSW_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xMSW" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_PM[wx.bkl] ###
COND_TOOLKIT_PM="#"
if test "x$TOOLKIT" = "xPM" ; then
COND_TOOLKIT_PM=""
fi
AC_SUBST(COND_TOOLKIT_PM)
dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_PM_USE_GUI_1="#"
if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_PM_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xPM" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_WINCE[wx.bkl] ###
COND_TOOLKIT_WINCE="#"
if test "x$TOOLKIT" = "xWINCE" ; then
COND_TOOLKIT_WINCE=""
fi
AC_SUBST(COND_TOOLKIT_WINCE)
dnl ### begin block 20_COND_TOOLKIT_WINCE_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_WINCE_USE_GUI_1="#"
if test "x$TOOLKIT" = "xWINCE" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_WINCE_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_WINCE_USE_GUI_1)
dnl ### begin block 20_COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0="#"
if test "x$TOOLKIT" = "xWINCE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_TOOLKIT_WINCE_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_TOOLKIT_X11[wx.bkl] ###
COND_TOOLKIT_X11="#"
if test "x$TOOLKIT" = "xX11" ; then
COND_TOOLKIT_X11=""
fi
AC_SUBST(COND_TOOLKIT_X11)
dnl ### begin block 20_COND_TOOLKIT_X11_USE_GUI_1[wx.bkl] ###
COND_TOOLKIT_X11_USE_GUI_1="#"
if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" ; then
COND_TOOLKIT_X11_USE_GUI_1=""
fi
AC_SUBST(COND_TOOLKIT_X11_USE_GUI_1)
dnl ### begin block 20_COND_UNICODE_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_UNICODE_1="#"
if test "x$UNICODE" = "x1" ; then
COND_UNICODE_1=""
fi
AC_SUBST(COND_UNICODE_1)
dnl ### begin block 20_COND_USE_EXCEPTIONS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_EXCEPTIONS_0="#"
if test "x$USE_EXCEPTIONS" = "x0" ; then
COND_USE_EXCEPTIONS_0=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_0)
dnl ### begin block 20_COND_USE_EXCEPTIONS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_EXCEPTIONS_1="#"
if test "x$USE_EXCEPTIONS" = "x1" ; then
COND_USE_EXCEPTIONS_1=""
fi
AC_SUBST(COND_USE_EXCEPTIONS_1)
dnl ### begin block 20_COND_USE_GUI_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_0="#"
if test "x$USE_GUI" = "x0" ; then
COND_USE_GUI_0=""
fi
AC_SUBST(COND_USE_GUI_0)
dnl ### begin block 20_COND_USE_GUI_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1="#"
if test "x$USE_GUI" = "x1" ; then
COND_USE_GUI_1=""
fi
AC_SUBST(COND_USE_GUI_1)
dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_0[wx.bkl] ###
COND_USE_GUI_1_WXUNIV_0="#"
if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
COND_USE_GUI_1_WXUNIV_0=""
fi
AC_SUBST(COND_USE_GUI_1_WXUNIV_0)
dnl ### begin block 20_COND_USE_GUI_1_WXUNIV_1[wx.bkl] ###
COND_USE_GUI_1_WXUNIV_1="#"
if test "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
COND_USE_GUI_1_WXUNIV_1=""
fi
AC_SUBST(COND_USE_GUI_1_WXUNIV_1)
dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 20_COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 20_COND_USE_ODBC_1[../../demos/dbbrowse/dbbrowse.bkl,../../samples/db/db.bkl] ###
COND_USE_ODBC_1="#"
if test "x$USE_ODBC" = "x1" ; then
COND_USE_ODBC_1=""
fi
AC_SUBST(COND_USE_ODBC_1)
dnl ### begin block 20_COND_USE_OPENGL_1[../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl] ###
COND_USE_OPENGL_1="#"
if test "x$USE_OPENGL" = "x1" ; then
COND_USE_OPENGL_1=""
fi
AC_SUBST(COND_USE_OPENGL_1)
dnl ### begin block 20_COND_USE_PLUGINS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_PLUGINS_0="#"
if test "x$USE_PLUGINS" = "x0" ; then
COND_USE_PLUGINS_0=""
fi
AC_SUBST(COND_USE_PLUGINS_0)
dnl ### begin block 20_COND_USE_RTTI_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_RTTI_0="#"
if test "x$USE_RTTI" = "x0" ; then
COND_USE_RTTI_0=""
fi
AC_SUBST(COND_USE_RTTI_0)
dnl ### begin block 20_COND_USE_RTTI_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_RTTI_1="#"
if test "x$USE_RTTI" = "x1" ; then
COND_USE_RTTI_1=""
fi
AC_SUBST(COND_USE_RTTI_1)
dnl ### begin block 20_COND_USE_SOSYMLINKS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_USE_SOSYMLINKS_1="#"
if test "x$USE_SOSYMLINKS" = "x1" ; then
COND_USE_SOSYMLINKS_1=""
fi
AC_SUBST(COND_USE_SOSYMLINKS_1)
dnl ### begin block 20_COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
if test "x$USE_SOVERCYGWIN" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1=""
fi
AC_SUBST(COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1)
dnl ### begin block 20_COND_USE_SOVERLINUX_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_USE_SOVERLINUX_1="#"
if test "x$USE_SOVERLINUX" = "x1" ; then
COND_USE_SOVERLINUX_1=""
fi
AC_SUBST(COND_USE_SOVERLINUX_1)
dnl ### begin block 20_COND_USE_SOVERSION_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_USE_SOVERSION_0="#"
if test "x$USE_SOVERSION" = "x0" ; then
COND_USE_SOVERSION_0=""
fi
AC_SUBST(COND_USE_SOVERSION_0)
dnl ### begin block 20_COND_USE_SOVERSOLARIS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSOLARIS_1=""
fi
AC_SUBST(COND_USE_SOVERSOLARIS_1)
dnl ### begin block 20_COND_USE_THREADS_0[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_THREADS_0="#"
if test "x$USE_THREADS" = "x0" ; then
COND_USE_THREADS_0=""
fi
AC_SUBST(COND_USE_THREADS_0)
dnl ### begin block 20_COND_USE_THREADS_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_THREADS_1="#"
if test "x$USE_THREADS" = "x1" ; then
COND_USE_THREADS_1=""
fi
AC_SUBST(COND_USE_THREADS_1)
dnl ### begin block 20_COND_USE_XRC_1[../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_USE_XRC_1="#"
if test "x$USE_XRC" = "x1" ; then
COND_USE_XRC_1=""
fi
AC_SUBST(COND_USE_XRC_1)
dnl ### begin block 20_COND_WINDOWS_IMPLIB_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,wx.bkl] ###
COND_WINDOWS_IMPLIB_1="#"
if test "x$WINDOWS_IMPLIB" = "x1" ; then
COND_WINDOWS_IMPLIB_1=""
fi
AC_SUBST(COND_WINDOWS_IMPLIB_1)
dnl ### begin block 20_COND_WITH_PLUGIN_SDL_1[wx.bkl] ###
COND_WITH_PLUGIN_SDL_1="#"
if test "x$WITH_PLUGIN_SDL" = "x1" ; then
COND_WITH_PLUGIN_SDL_1=""
fi
AC_SUBST(COND_WITH_PLUGIN_SDL_1)
dnl ### begin block 20_COND_WXUNIV_0[wx.bkl] ###
COND_WXUNIV_0="#"
if test "x$WXUNIV" = "x0" ; then
COND_WXUNIV_0=""
fi
AC_SUBST(COND_WXUNIV_0)
dnl ### begin block 20_COND_WXUNIV_1[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUNIV_1="#"
if test "x$WXUNIV" = "x1" ; then
COND_WXUNIV_1=""
fi
AC_SUBST(COND_WXUNIV_1)
dnl ### begin block 20_COND_WXUSE_EXPAT_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUSE_EXPAT_BUILTIN="#"
if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
COND_WXUSE_EXPAT_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_EXPAT_BUILTIN)
dnl ### begin block 20_COND_WXUSE_LIBJPEG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUSE_LIBJPEG_BUILTIN="#"
if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
COND_WXUSE_LIBJPEG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBJPEG_BUILTIN)
dnl ### begin block 20_COND_WXUSE_LIBPNG_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUSE_LIBPNG_BUILTIN="#"
if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
COND_WXUSE_LIBPNG_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBPNG_BUILTIN)
dnl ### begin block 20_COND_WXUSE_LIBTIFF_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUSE_LIBTIFF_BUILTIN="#"
if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
COND_WXUSE_LIBTIFF_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_LIBTIFF_BUILTIN)
dnl ### begin block 20_COND_WXUSE_ODBC_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUSE_ODBC_BUILTIN="#"
if test "x$wxUSE_ODBC" = "xbuiltin" ; then
COND_WXUSE_ODBC_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ODBC_BUILTIN)
dnl ### begin block 20_COND_WXUSE_REGEX_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUSE_REGEX_BUILTIN="#"
if test "x$wxUSE_REGEX" = "xbuiltin" ; then
COND_WXUSE_REGEX_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_REGEX_BUILTIN)
dnl ### begin block 20_COND_WXUSE_ZLIB_BUILTIN[../../contrib/build/animate/animate.bkl,../../contrib/build/deprecated/deprecated.bkl,../../contrib/build/fl/fl.bkl,../../contrib/build/foldbar/foldbar.bkl,../../contrib/build/gizmos/gizmos.bkl,../../contrib/build/mmedia/mmedia.bkl,../../contrib/build/net/net.bkl,../../contrib/build/ogl/ogl.bkl,../../contrib/build/plot/plot.bkl,../../contrib/build/stc/stc.bkl,../../contrib/build/svg/svg.bkl,../../contrib/samples/animate/anitest.bkl,../../contrib/samples/deprecated/proplist/proplist.bkl,../../contrib/samples/deprecated/resource/resource.bkl,../../contrib/samples/deprecated/treelay/treelay.bkl,../../contrib/samples/fl/fl.bkl,../../contrib/samples/foldbar/extended/extended.bkl,../../contrib/samples/foldbar/foldpanelbar/foldtest.bkl,../../contrib/samples/gizmos/dynsash/dynsash.bkl,../../contrib/samples/gizmos/dynsash_switch/dynsash_switch.bkl,../../contrib/samples/gizmos/editlbox/editlbox.bkl,../../contrib/samples/gizmos/led/led.bkl,../../contrib/samples/gizmos/multicell/multicell.bkl,../../contrib/samples/gizmos/splittree/splittree.bkl,../../contrib/samples/mmedia/mmboard.bkl,../../contrib/samples/ogl/ogledit/ogledit.bkl,../../contrib/samples/ogl/studio/studio.bkl,../../contrib/samples/plot/plot.bkl,../../contrib/samples/stc/stctest.bkl,../../contrib/samples/svg/svgtest.bkl,../../contrib/utils/convertrc/convertrc.bkl,../../demos/bombs/bombs.bkl,../../demos/dbbrowse/dbbrowse.bkl,../../demos/forty/forty.bkl,../../demos/fractal/fractal.bkl,../../demos/life/life.bkl,../../demos/poem/poem.bkl,../../samples/access/access.bkl,../../samples/artprov/artprov.bkl,../../samples/calendar/calendar.bkl,../../samples/caret/caret.bkl,../../samples/checklst/checklst.bkl,../../samples/config/config.bkl,../../samples/console/console.bkl,../../samples/controls/controls.bkl,../../samples/db/db.bkl,../../samples/debugrpt/debugrpt.bkl,../../samples/dialogs/dialogs.bkl,../../samples/dialup/dialup.bkl,../../samples/display/display.bkl,../../samples/dnd/dnd.bkl,../../samples/docview/docview.bkl,../../samples/docvwmdi/docvwmdi.bkl,../../samples/dragimag/dragimag.bkl,../../samples/drawing/drawing.bkl,../../samples/dynamic/dynamic.bkl,../../samples/erase/erase.bkl,../../samples/event/event.bkl,../../samples/except/except.bkl,../../samples/exec/exec.bkl,../../samples/font/font.bkl,../../samples/grid/grid.bkl,../../samples/help/help.bkl,../../samples/htlbox/htlbox.bkl,../../samples/html/about/about.bkl,../../samples/html/help/help.bkl,../../samples/html/helpview/helpview.bkl,../../samples/html/htmlctrl/htmlctrl.bkl,../../samples/html/printing/printing.bkl,../../samples/html/test/test.bkl,../../samples/html/virtual/virtual.bkl,../../samples/html/widget/widget.bkl,../../samples/html/zip/zip.bkl,../../samples/image/image.bkl,../../samples/internat/internat.bkl,../../samples/ipc/ipc.bkl,../../samples/joytest/joytest.bkl,../../samples/keyboard/keyboard.bkl,../../samples/layout/layout.bkl,../../samples/listbox/listbox.bkl,../../samples/listctrl/listctrl.bkl,../../samples/mdi/mdi.bkl,../../samples/mediaplayer/mediaplayer.bkl,../../samples/memcheck/memcheck.bkl,../../samples/menu/menu.bkl,../../samples/mfc/mfc.bkl,../../samples/minifram/minifram.bkl,../../samples/minimal/minimal.bkl,../../samples/mobile/styles/styles.bkl,../../samples/mobile/wxedit/wxedit.bkl,../../samples/multimon/multimon.bkl,../../samples/nativdlg/nativdlg.bkl,../../samples/notebook/notebook.bkl,../../samples/oleauto/oleauto.bkl,../../samples/opengl/cube/cube.bkl,../../samples/opengl/isosurf/isosurf.bkl,../../samples/opengl/penguin/penguin.bkl,../../samples/ownerdrw/ownerdrw.bkl,../../samples/png/png.bkl,../../samples/popup/popup.bkl,../../samples/printing/printing.bkl,../../samples/propsize/propsize.bkl,../../samples/regtest/regtest.bkl,../../samples/render/render.bkl,../../samples/richedit/richedit.bkl,../../samples/rotate/rotate.bkl,../../samples/sashtest/sashtest.bkl,../../samples/scroll/scroll.bkl,../../samples/scrollsub/scrollsub.bkl,../../samples/shaped/shaped.bkl,../../samples/sockets/sockets.bkl,../../samples/sound/sound.bkl,../../samples/splash/splash.bkl,../../samples/splitter/splitter.bkl,../../samples/statbar/statbar.bkl,../../samples/taskbar/taskbar.bkl,../../samples/text/text.bkl,../../samples/thread/thread.bkl,../../samples/toolbar/toolbar.bkl,../../samples/treectrl/treectrl.bkl,../../samples/typetest/typetest.bkl,../../samples/validate/validate.bkl,../../samples/vscroll/vscroll.bkl,../../samples/widgets/widgets.bkl,../../samples/wizard/wizard.bkl,../../samples/xrc/xrcdemo.bkl,../../tests/test.bkl,../../utils/HelpGen/src/helpgen.bkl,../../utils/configtool/src/configtool.bkl,../../utils/emulator/src/emulator.bkl,../../utils/helpview/src/helpview.bkl,../../utils/hhp2cached/hhp2cached.bkl,../../utils/tex2rtf/src/tex2rtf.bkl,../../utils/wxrc/wxrc.bkl,wx.bkl] ###
COND_WXUSE_ZLIB_BUILTIN="#"
if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
COND_WXUSE_ZLIB_BUILTIN=""
fi
AC_SUBST(COND_WXUSE_ZLIB_BUILTIN)

View File

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

View File

@@ -1 +0,0 @@
wince

View File

@@ -1,195 +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],
[wx_cv_[]_AC_LANG_ABBREV[]_compiler_xlc],
[AC_TRY_COMPILE([],[#ifndef __xlC__
choke me
#endif
],
[wx_compiler_xlc=yes],
[wx_compiler_xlc=no])
wx_cv_[]_AC_LANG_ABBREV[]_compiler_xlc=$wx_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 $wx_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 $wx_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
])
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 Loosely based on autoconf AC_PROG_CC
AC_DEFUN([AC_BAKEFILE_PROG_SUNCC],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C, __SUNPRO_C, SUNCC=yes)
])
dnl Loosely based on autoconf AC_PROG_CC
AC_DEFUN([AC_BAKEFILE_PROG_SUNCXX],
[
_AC_BAKEFILE_LANG_COMPILER(Sun, C++, __SUNPRO_CC, SUNCXX=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], wx_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)
wx_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$wx_cv_[]_AC_LANG_ABBREV[]_exto" '!=' "x"; then
if test "[]_AC_LANG_ABBREV[]" = "c"; then
CFLAGS="$wx_cv_[]_AC_LANG_ABBREV[]_exto $CFLAGS"
fi
if test "[]_AC_LANG_ABBREV[]" = "cxx"; then
CXXFLAGS="$wx_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 ===========================================================================
AC_DEFUN([AC_BAKEFILE_PROG_CC],
[
AC_PROG_CC
AC_BAKEFILE_METROWERKS_EXTO
dnl By the time we find out that we need -ext o some tests have failed.
if test "x$wx_cv_c_exto" '!=' "x"; then
unset ac_cv_prog_cc_g
_AC_PROG_CC_G
fi
AC_BAKEFILE_PROG_MWCC
AC_BAKEFILE_PROG_XLCC
AC_BAKEFILE_PROG_SGICC
AC_BAKEFILE_PROG_SUNCC
])
AC_DEFUN([AC_BAKEFILE_PROG_CXX],
[
AC_PROG_CXX
AC_BAKEFILE_METROWERKS_EXTO
dnl By the time we find out that we need -ext o some tests have failed.
if test "x$wx_cv_cxx_exto" '!=' "x"; then
unset ac_cv_prog_cxx_g
_AC_PROG_CXX_G
fi
AC_BAKEFILE_PROG_MWCXX
AC_BAKEFILE_PROG_XLCXX
AC_BAKEFILE_PROG_SGICXX
AC_BAKEFILE_PROG_SUNCXX
])

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,2 +0,0 @@
.bakefile_gen.state
Bakefiles.local.bkgen

View File

@@ -1,259 +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>
<!-- 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,56 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!--
Generate build.cfg file on Windows, with settings used to build
the library.
-->
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','MGL'] and FORMAT!='msvc6prj' and FORMAT!='msevc4prj' and FORMAT!='cbuilderx'">
<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,700 +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>
</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>
<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>
</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>
<template id="msvc_setup_h">
<msvc-copy-setup-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>
<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>
<!-- this include is added by configure, we need to put other
includes before it: -->
<include cond="FORMAT!='autoconf'">$(TOP_SRCDIR)include</include>
<lib-path>$(LIBDIRNAME)</lib-path>
<include cond="FORMAT!='autoconf'">$(SETUPHDIR)</include>
<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 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=='msvc' or FORMAT=='msvc6prj' or 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>
<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>
<res-include cond="FORMAT=='autoconf'">
$(TOP_SRCDIR)include
</res-include>
</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'">
<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,122 +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: -->
<res-include cond="FORMAT=='autoconf'">
$(TOP_SRCDIR)include
</res-include>
<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,414 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<set var="BUILDING_LIB" overwrite="0">0</set>
<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>
<!-- 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="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'">DOS</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'">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>
</makefile>

View File

@@ -1,43 +0,0 @@
<?xml version="1.0" ?>
<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>
<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,79 +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>
<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,266 +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>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>

View File

@@ -1,45 +0,0 @@
<?xml version="1.0" ?>
<makefile>
<if cond="FORMAT=='autoconf'">
<option name="wxUSE_ODBC"/>
<set var="LIB_ODBC">
<if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)</if>
</set>
</if>
<if cond="FORMAT!='autoconf'">
<set var="wxUSE_ODBC">
<if cond="PLATFORM_UNIX=='1'">builtin</if>
<if cond="PLATFORM_UNIX=='0'">0</if>
</set>
<set var="LIB_ODBC">
<if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
</if>
<set var="INC_ODBC">
<if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)src/odbc</if>
</set>
<lib id="wxodbc" template="3rdparty_lib"
cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
<dirname>$(LIBDIRNAME)</dirname>
<sources>
src/iodbc/catalog.c
src/iodbc/connect.c
src/iodbc/dlf.c
src/iodbc/dlproc.c
src/iodbc/execute.c
src/iodbc/fetch.c
src/iodbc/hdbc.c
src/iodbc/henv.c
src/iodbc/herr.c
src/iodbc/hstmt.c
src/iodbc/info.c
src/iodbc/itrace.c
src/iodbc/misc.c
src/iodbc/prepare.c
src/iodbc/result.c
</sources>
</lib>
</makefile>

View File

@@ -1,41 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================= -->
<!-- OpenGL canvas library -->
<!-- ================================================================= -->
<set var="WXLIBGLDEP_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIBGLDEP_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<dll id="gldll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_OPENGL=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_GL</define>
<sources>$(OPENGL_SRC)</sources>
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
<!-- link against base and core libs in multilib build: -->
<sys-lib>$(WXLIBGLDEP_CORE)</sys-lib>
<sys-lib>$(WXLIBGLDEP_BASE)</sys-lib>
<depends>basedll</depends>
<depends>coredll</depends>
<!-- link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<ldlibs>$(EXTRALIBS_OPENGL)</ldlibs>
</dll>
<lib id="gllib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_OPENGL=='1'">
<sources>$(OPENGL_SRC)</sources>
<msvc-headers>$(OPENGL_HDR)</msvc-headers>
</lib>
</makefile>

View File

@@ -1,16 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- ================================================================ -->
<!-- Unix audio plugins -->
<!-- ================================================================ -->
<wx-base-plugin id="sound_sdl" cond="WITH_PLUGIN_SDL=='1'">
<sources>$(UNIX_SOUND_SRC_SDL)</sources>
<ldlibs>$(EXTRALIBS_SDL)</ldlibs>
</wx-base-plugin>
</makefile>

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" ?>
<!-- $Id$ -->
<makefile>
<!-- Additional dependencies of core libraries if plugins are
disabled (these would be deps of the plugins if they were
enabled): -->
<set var="PLUGIN_ADV_EXTRALIBS">
<if cond="USE_PLUGINS=='0'">
$(EXTRALIBS_SDL)
</if>
</set>
<!-- monolithic library must link against all this: -->
<set var="PLUGIN_MONOLIB_EXTRALIBS">$(PLUGIN_ADV_EXTRALIBS)</set>
</makefile>

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