AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
55,396 Commits 1 Branch 0 Tags 297 MiB
fa3f11806e
Commit Graph

55396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vadim Zeitlin
fa3f11806e Use wx/msw/winundef.h for wxGTK under Windows too. 
Avoid clashes due to <windows.h> definitions in wxGTK too.

Closes #14427.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71823 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 17:54:53 +00:00
Vadim Zeitlin
6fafab0ea3 No real changes, just simplify wxGDIPlusContext::GetTextExtent() a bit. 
Don't call Font::GetSize() and FontFamily::GetEmHeight() thrice, just do it
once and store the results. This makes the code both simpler and shorter and
marginally more efficient.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71822 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 17:54:49 +00:00
Vadim Zeitlin
b437ff98b0 Fix text extent computation in wxMSW wxGraphicsContext. 
The results were incorrect for italic or bold fonts as we hardcoded
FontStyleRegular instead of using the real font style.

Closes #14421.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 17:54:46 +00:00
Vadim Zeitlin
7e3ea54f47 Add missing c_str() and similar calls to samples in STL build. 
Don't rely on implicit conversion of wxString to char*/wxChar*, it doesn't
exist in STL build. Add explicit c_str(), wc_str() or t_str() calls.

Closes #14420.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 17:54:42 +00:00
Vadim Zeitlin
9597d39a2e Use C, not C++, comments in wx/gtk/chkconf.h. 
Remove C++ comments added in r71796.

See #14412.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71819 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 17:54:38 +00:00
Robin Dunn
e1b7217e23 Interface tweaks for Phoenix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 17:10:23 +00:00
Stefan Csomor
372d999e64 make sure native font exists, before asking about fixed width 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 10:34:30 +00:00
Stefan Csomor
2979ddbe2f using UTType constants wherever possible to avoid typos, checking for failed conversions, leveraging native conversion of types, fixes #13442 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71809 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-20 07:16:03 +00:00
Stefan Csomor
9ba371fa05 supporting promised file urls for transfer, see #14281 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-18 20:27:35 +00:00
Julian Smart
5a376169b1 Fixed #14417: wxRichTextCtrl crashes on LoadFile 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71806 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-18 18:45:30 +00:00
Paul Cornett
268fba466f build fix for wxUSE_STL==1 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71805 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-18 16:11:36 +00:00
Stefan Csomor
fb35086d8c supporting promised file urls for transfer, see #14281 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71804 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-18 15:13:53 +00:00
Robin Dunn
37a181d500 Interface fixes for Phoenix 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71800 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-18 02:14:07 +00:00
Vadim Zeitlin
acbed1149e Fixes for building wxGTK under Cygwin. 
Test for __WXMSW__ instead of __CYGWIN__ to not affect building non-MSW ports
such as wxGTK under Cygwin.

See #14382.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71799 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:35:14 +00:00
Vadim Zeitlin
954fd05108 Disable creation of wxDIB from wxBitmap in non-wxMSW ports. 
wxDIB can now be used with wxGTK under Windows, i.e. when not using wxMSW
version of wxBitmap but it can't be created from wxBitmap then as it doesn't
have a corresponding HBITMAP.

Simply disable this functionality when not using wxMSW.

Closes #14414.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71798 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:35:10 +00:00
Vadim Zeitlin
598fe99d56 Move wxBell() from base to core library. 
This allows to get rid of ugly preprocessor checks due to the fact that this
function could be defined in one or the other library depending on the port
used and also fix a problem with it being defined differently in the base
library depending on which GUI port (Carbon or Cocoa) was used under OS X.
It also fixes the problem with wxBell() in wxGTK under Windows.

Closes #14406.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71797 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:35:06 +00:00
Vadim Zeitlin
54f59b007e Disable options that don't work with wxGTK in wx/chkconf.h. 
When building wxGTK under Windows, some MSW-specific options can be defined
but can't be implemented when using GTK, forcefully disable them.

Also a few others that could be implemented but that don't work currently.

Finally, forcefully enable Cairo support as wxGTK always needs it.

Closes #14412.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71796 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:35:01 +00:00
Vadim Zeitlin
1383c34c91 Define wxGTK GTK version symbols in GTK-specific setup.h. 
When not using configure __WXGTKxxx__ symbols should still be defined, assume
we use a recent GTK 2.x version and define all of them.

Closes #14411.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:34:57 +00:00
Vadim Zeitlin
85b1dc6e3c Don't use Unix-specific wxGTK utility functions under non-Unix. 
Unix-specific functions shouldn't be used under Windows, add "#ifdef __UNIX__"
guards around them.

Closes #14410.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71794 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:34:54 +00:00
Vadim Zeitlin
a7130edbab Provide wxGetKeyState() studfor wxGTK under Windows. 
Under Unix this function is implemented in X11-specific code, so provide a
stub under Windows to at least avoid link errors.

Closes #14409.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:34:50 +00:00
Vadim Zeitlin
b33e9f4031 Add wxUSE_COMPILER_TLS to allow disabling compiler TLS support. 
Compiler TLS support is broken under Win32/MSVC when used for a code which is
part of a dynamically loaded DLL, so allow disabling it.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71792 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 21:34:47 +00:00
Paul Cornett
233f786e8e update version check for glib 2.32 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71791 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-17 17:08:35 +00:00
Vadim Zeitlin
8e2c6c3f7d No real changes, just use wxSize::Get{Width,Height} and not Get{X,Y}. 
Use more readable accessors in wxGrid code to avoid confusion between wxGrid
(x, y) coordinates and wxSize (x, y) fields.

Closes #14347.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 23:23:27 +00:00
Vadim Zeitlin
4a699e3a59 Remove unnecessary base class OnPaint() call from wxGenericColourDialog. 
Events should be skipped instead of calling the base class event handler
directly, but in this case even this is not needed as wxGenericColourDialog
takes care of processing the event completely.

Closes #14405.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 23:23:23 +00:00
Vadim Zeitlin
d6cf9064d4 Remove left over conflict markers from documentation. 
Closes #14404.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71787 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 23:23:20 +00:00
Vadim Zeitlin
95fbc73897 Fix compilation of MSW wxFSVolume with non-wxMSW ports. 
There is no way to construct wxIcon from HICON when not using wxMSW, just
leave it unimplemented for non-wxMSW ports.

Closes #14402.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 23:23:16 +00:00
Vadim Zeitlin
568fb7e9f6 Fix harmless MSVC warning about converting pointer to bool. 
Compare the pointer with NULL explicitly to avoid "forcing value to bool"
warning C4800 from MSVC in richtext code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71785 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 23:23:14 +00:00
Vadim Zeitlin
6114fa0350 Only use Unix sockets API under Unix in wxGTK. 
wxGTK can now be used under Windows where Unix sockets are not available, add
a __UNIX__ preprocessor check.

Closes #14407.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 23:23:11 +00:00
Stefan Csomor
0090b737ff trying to improve appearance of gridcelltexteditor under OSX, see #14042 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71783 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 17:48:29 +00:00
Stefan Csomor
1bfba4a096 avoid idling in native file dialogs 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71782 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 16:57:27 +00:00
Stefan Csomor
c657294b52 better naming wxCFEventLoopPauseIdleEvents 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 16:24:09 +00:00
Stefan Csomor
ffbee8108f using suppression of idle processing (delayed destruction happened too early eg when showing native message boxes) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 00:04:50 +00:00
Stefan Csomor
4c4cbded1f offer suppression of idle processing (delayed destruction happened too early eg when showing native message boxes) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71778 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-15 00:03:51 +00:00
Stefan Csomor
9ef3f6f2c9 setting debug level explicitly 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 23:21:57 +00:00
Stefan Csomor
c0b301f4e5 cleanup for 10.5 minimum 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 22:29:07 +00:00
Stefan Csomor
d20028be9a clang analyzer support specific for OSX 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 22:02:06 +00:00
Stefan Csomor
a2c3d6b820 FixedWith support through CoreText 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:55:28 +00:00
Stefan Csomor
721ba9cbdc using CoreText under iOS 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:53:06 +00:00
Stefan Csomor
f5fac4471b guarding agains NULL 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:51:19 +00:00
Stefan Csomor
7d5b794ce4 guard XTI 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71766 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:47:52 +00:00
Stefan Csomor
8ffac5b07b CoreText font enumeration support for iOS 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:46:34 +00:00
Stefan Csomor
51b0f3719b CoreText support for iOS 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:43:42 +00:00
Stefan Csomor
e1875c7859 fixing analyzer warning 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:40:12 +00:00
Stefan Csomor
ecbbb06b3b removing superfluous 10.5 checks 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71762 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 21:37:08 +00:00
Stefan Csomor
63660cba0a as we always have CoreText available under 10.5+, we can properly determine fixed widths fonts, also use latest CoreText API if available 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71761 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 19:11:52 +00:00
Stefan Csomor
2b760b6bc1 removing attribute, as assert is not guaranteed not to return, but may just go on 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71760 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-14 15:07:14 +00:00
Stefan Csomor
b625fff509 using WX_ATTRIBUTE_NORETURN for asserts 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-13 23:33:52 +00:00
Stefan Csomor
9deded7972 adding WX_ATTRIBUTE_NORETURN support (for functions like assert, exit etc. that may not return) 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71755 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-13 23:33:00 +00:00
Robin Dunn
aa3cb98a40 minor doc tweak 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-13 23:20:20 +00:00
Robin Dunn
bab9aa28da Fix for compilo on non-PCH builds 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71750 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
 2012-06-13 23:20:14 +00:00