Commit Graph

1796 Commits

Author SHA1 Message Date
Vadim Zeitlin
0b0bed0fca Move wxMSW wxCommandLinkButton files to native-only part.
wxMSW wxCommandLinkButton implementation shouldn't be used in wxUniv so move
src/msw/commandlinkbutton.cpp and include/wx/msw/commandlinkbutton.h to
ADVANCED_MSW_NATIVE_{SRC,HDR} from ADVANCED_MSW_{SRC,HDR} in files.bkl and
rebake the makefiles.

This fixes wxUniv/MSW compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66495 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-30 22:37:17 +00:00
Stefan Csomor
95647df73d removing obsolete NO_PRAGMA
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-28 16:44:15 +00:00
Vadim Zeitlin
5bf7b950a4 Run tests with "-t" option on OS X too.
OS X build slave used its own commands to run unit tests, add -t to them too
to be (hopefully) able to see better where does the test crash exactly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66440 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-23 12:48:00 +00:00
Stefan Csomor
9cb50d3a2c attempt at making the line continuation characters stay correct
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 13:28:32 +00:00
Stefan Csomor
b7e15982d3 updating files list for iphone opengl
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66357 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 10:11:53 +00:00
Stefan Csomor
9b0fdac056 updated comment was not saved in former commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-07 09:45:54 +00:00
Paul Cornett
b61cc19c06 merge libpng 1.4.4 to trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66303 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-30 18:41:25 +00:00
Paul Cornett
818eb2767c add src/gtk1/mnemonics.cpp to files.bkl and rebake
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66302 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-30 18:01:53 +00:00
Vadim Zeitlin
ccec90930c Add wxVersionInfo and functions returning it for 3rd party libraries.
Add simple wxVersionInfo class holding the version information.

Also add GetLibraryVersionInfo() static method to wx{JPEG,PNG,TIFF}Handler,
wxStyledTextCtrl and wxXmlDocument classes and wxGetZlibVersionInfo() and
wxGetLibraryVersionInfo() global functions using it.

Closes #12690.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-25 00:53:44 +00:00
Vadim Zeitlin
2a9b583b48 Revert "Always define WXUSINGDLL when compiling Scintilla in shared wx build."
Finally it's unnecessary to define WXUSINGDLL when building wxScintilla
library as it doesn't use the main DLL, it is simply used as part of it.

This reverts r66222 and finally closes #12626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 12:49:25 +00:00
Vadim Zeitlin
1907df9d5b Use correct wxDEBUG_LEVEL value when building wxscintilla library.
wxScintilla code uses wxVector<> which brings in wxDEBUG_LEVEL-dependent code
so we must use the wxDEBUG_LEVEL value consistent with the rest of the library
when building it.

Simply pass wxDEBUG_LEVEL definition on the compiler command line if it's
different from the default.

Closes #12626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:17 +00:00
Vadim Zeitlin
02c9115ba8 Always define WXUSINGDLL when compiling Scintilla in shared wx build.
We need WXUSINGDLL even in monolithic build because Scintilla references wx
debugging functions (wxOnAssert(), wxTheAssertHandler &c) which still must be
seen as being exported from the (monolithic) DLL in this case.

See #12626.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66222 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-22 01:22:07 +00:00
Chris Elliott
2dea359953 add execmon to CE exclude (no console)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 16:05:38 +00:00
Chris Elliott
b45054eaaf missing namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 15:45:51 +00:00
Chris Elliott
bbaf9672e6 missing namespace
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66019 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-11-05 15:24:27 +00:00
Vadim Zeitlin
7ec75d3e9f Rebake to add wx/meta/implicitconversion.h to the makefiles.
Rebake after the addition of a new public header in r65920.

Closes #12616.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-26 15:10:48 +00:00
Václav Slavík
a52475807e Make wxMin, wxMax and wxClip template functions.
Previously used macro's arguments were evaluated twice, but there were
many occurences of their use in our code that didn't account for this
and used expensive-to-evaluate arguments as if they were functions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-25 09:43:00 +00:00
Vadim Zeitlin
4689441b05 Add XRC handler for wxToolbook.
Closes #11615.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 18:56:28 +00:00
Vadim Zeitlin
7f75598947 Use rpmbuild to build the RPMs in "make rpm" target.
In recent versions of rpm rpmbuild must be used for building the RPMs instead
of rpm itself.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65880 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:57 +00:00
Vadim Zeitlin
b3706b40d2 Add more headers to "make dist" and remove .mo files.
Add wx/persist headers to the list of files used by "make dist" and remove the
message catalogs which shouldn't be part of the source distribution.

See #12567.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-23 14:09:49 +00:00
Michael Wetherell
c5084fff34 Add debugging info to the trunk Linux builds.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-22 22:12:00 +00:00
Vadim Zeitlin
53cdd2c11d Add XRC handler for wxCommandLinkButton.
Added a handler for wxCommandLinkButton class and a demo of it in the xrc sample.

Closes #12593.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 23:11:20 +00:00
Michael Wetherell
ab3332517f Check for window manager before running GUI tests on unix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-20 13:08:32 +00:00
Michael Wetherell
5f8bf0ee6f Disable the Mingw x64 builds as there's no compiler.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-17 14:06:30 +00:00
Vadim Zeitlin
489f5a3d2e Include wx_presets.py in the distribution made by "make dist".
This file is required by "make install".

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65817 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-15 23:46:24 +00:00
Vadim Zeitlin
5b84e5273b Remove obsolete files from "make dist" rules.
Avoid errors due to attempts to copy non-existing files when making Unix
distribution.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:53:54 +00:00
Vadim Zeitlin
d5cbcec97d Skip Windows-only samples when making Unix distribution.
Some samples are by definition Windows-only so they don't have Makefile.in
files for Unix at all, skip them when creating the Unix distribution to avoid
errors due to attempts to copy non-existent files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:53:50 +00:00
Vadim Zeitlin
caf019265a Include include/wx/generic/private/*.h files in distribution.
We must include the generic private files into the distribution as well,
otherwise at least wxGTK fails to build.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-13 22:53:45 +00:00
Vadim Zeitlin
cdaed652d7 Merge of SOC2010_RTC_IMAGES branch.
Added floating images and image property dialog to wxRichTextCtrl, by Mingquan
Yang as part of GSOC 2010. Also changed image block creation to use a memory
stream instead of creating a temporary file.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65676 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 10:27:07 +00:00
Robin Dunn
e5ad1e9d4b Various build tweaks and updates for wxPython 2.9.1.1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-23 21:05:30 +00:00
Dimitri Schoolwerth
09a8cab77b Fix possible errors introduced while generating Xcode project.
Under some unknown circumstances two added source files are concatenated into one faulty entry in an Xcode project (this probably occurs either at the Xcode or XMLTools2 level). Try to detect these errors in the Python script and fix them by patching up the project.pbxproj file.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65554 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 22:13:40 +00:00
Dimitri Schoolwerth
a99dbd9eba Use a unique namespace for generating identifiers.
Instead of using uuid.NAMESPACE_DNS as namespace use a newly generated UUID. Also minor cleanup of import uuid statement.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 11:45:32 +00:00
Dimitri Schoolwerth
7f71d431ee Make Xcode identifier consecutive when there is a collision.
Making them consecutive groups source files that are repeated next to each other in the project file like Xcode does, instead of creating a complete new random identifier which resulted in creating a distance between the source files after they were sorted.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-15 11:29:07 +00:00
Vadim Zeitlin
b672b8f490 Don't exclude "contrib" from wxMSW setup.exe generation.
This was presumably needed to exclude the top level contrib directory but also
seems to apply to src/tiff/contrib and excluding this directory breaks
configuration of libtiff as it looks for src/tiff/contrib/Makefile.in.

As we don't even have top level contrib any more, simply don't exclude it any
longer.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65482 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-09 10:18:31 +00:00
Dimitri Schoolwerth
59719014c5 Make Xcode identifiers in generated project files be the same after each run.
From the AppleScript that composes the Xcode projects call a Python script that bases the identifiers on an associated name instead of being random each run like Xcode does. After the Python script reopen the project again in Xcode to have the identifiers sorted (Xcode wants them to be), resulting in the project.pbxproj file being completely different inside but in the IDE the order of files still will be the same.



git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-08 17:11:15 +00:00
Vadim Zeitlin
5eda55f775 Use correct Unicode define for wxScintilla compilation.
Compilation of wxScintilla with Borland failed because -D_UNICODE was not
passed on command line resulting in mismatches between wxChar and Windows
TCHAR. It's a mystery why this didn't happen with the other compilers but
defining _UNICODE for them too can't hurt.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-07 21:37:22 +00:00
Václav Slavík
0a9c5e3564 Fixed wxscintilla compilation for wxDFB.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-03 19:33:11 +00:00
Vadim Zeitlin
65a14fe8ea Update wx_dll.dsw to include the ribbon library.
Add wx_ribbon project with dependency on core library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65453 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-01 09:48:24 +00:00
Vadim Zeitlin
2edda9670b Remove unused src/osx/cocoa/bmpbuttn.mm file.
This file was empty and unused any more so simply remove it and all references
to it in the makefiles.

This avoids warnings about empty object files in static builds of the library.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-22 23:45:53 +00:00
Vadim Zeitlin
c31d9c7f60 Use task dialog for wxProgressDialog implementation in wxMSW.
If available, the task dialog is now used for the wxProgressDialog under
Windows. This provides a much more native looking dialog which doesn't look
out of place under modern Windows versions, unlike the generic implementation.

The internals of the code had to be significantly changed as the task dialog
can only be shown modally so, to emulate wxProgressDialog modeless nature, a
separate thread is used for the progress dialog management.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:49:02 +00:00
Vadim Zeitlin
a1bdd4ab9b Add wxRichMessageDialog class.
This is a generalization of wxMessageDialog based on the native task dialog
under recent (Vista and later) Windows versions and implemented generically
for the other ports for now.

It provides the possibility to use additional controls in the message boxes
(checkbox useful for the "Don't ask me again" kind of dialogs and collapsible
detailed explanations field) and better look and feel under Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-18 22:48:41 +00:00
Vadim Zeitlin
b815cf68d2 Provide native wxHyperlinkCtrl implementation for wxMSW.
Use the "syslink" native control to implement wxHyperlinkCtrl under (recent
enough, i.e. XP or later) versions of Windows.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65334 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 16:55:32 +00:00
Vadim Zeitlin
3571e1add4 Add new wxCommandLinkButton class.
A command link button wraps a native MSW control under recent Windows versions
and is implemented generically as a simple bitmap button elsewhere.

In the future, GTK implementation should allow using a different font for the
button label and its note.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65327 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-17 14:48:50 +00:00
Javier Torres
dd5167e0bf New build slave for wxQt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-08-11 23:11:24 +00:00
Vadim Zeitlin
354a9ddf94 Only define WXUSINGDLL in multilib builds for wxscintilla.lib.
In monolithic builds wxscintilla is linked directly into the one and only wx
DLL and doesn't need to import anything from it, WXUSINGDLL is only needed in
multilib case when wxscintilla is part of wxCore DLL and does need to import
symbols (e.g. wxQsort() used by wxVector) from wxBase one.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65109 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 18:39:22 +00:00
Vadim Zeitlin
6d50f0a0ed Only define WXUSINGDLL in DLL configurations when building wxscintilla.
WXUSINGDLL shouldn't be defined in static build configurations, this results
in warnings and might explain errors in MinGW build.

Closes #11966.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:19:06 +00:00
Vadim Zeitlin
1ba904fea1 No real changes in makefile but avoid repetitious in bakefile.
Collect all preprocessor options needed for Scintilla compilation in
wxscintilla_cppflags template and use for both Scintilla compilation itself
and for the wx libraries using it.

The order of flags in the makefiles has changed but they are still the same
except for Borland makefile which now includes Borland-specific warning
suppression option everywhere it's needed and not just in multilib targets.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:57 +00:00
Vadim Zeitlin
1784742ca7 No changes, just remove hard TABs and fix a typo.
Separate trivial changes from subsequent commits.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:51 +00:00
Vadim Zeitlin
13c873f8ec Upgrade version in the bakefiles to 2.9.2 as well and rebake.
Rebake makefiles to update the name used for the shared libraries to reflect
the new version.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 00:18:34 +00:00
Michael Wetherell
7b8e38beef Fix buildbot build 'Linux i386 wxGTK stable STL' building wrong branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-24 15:32:57 +00:00