Commit Graph

99 Commits

Author SHA1 Message Date
Paul Cornett
a0f10ec1d6 Implement access to a global toplevel GdkWindow in a way that does not require always having an extra GtkWindow.
And don't use "RootWindow" in the name, it is not a root window in the X11 sense.
Also add wxGetPangoContext() to get access to a PangoContext.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76465 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-05-05 15:53:27 +00:00
Paul Cornett
8b4ae731d3 use wxOVERRIDE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-03-30 00:02:23 +00:00
Paul Cornett
0dfeb74e78 Different fix for cursor inheritance and busy cursor/global cursor.
Previous work was not compatible with GTK < 2.18 and did not properly handle some cases
see #15801


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75807 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-02-06 04:43:46 +00:00
Paul Cornett
04ad5f5aea remove some debugging code inadvertently checked in as part of r75690
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75691 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-23 18:37:29 +00:00
Paul Cornett
9f09241cd0 Fix cursor inheritance and busy cursor/global cursor, closes #15801
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-01-23 18:27:13 +00:00
Vadim Zeitlin
3f66f6a5b3 Remove all lines containing cvs/svn "$Id$" keyword.
This keyword is not expanded by Git which means it's not replaced with the
correct revision value in the releases made using git-based scripts and it's
confusing to have lines with unexpanded "$Id$" in the released files. As
expanding them with Git is not that simple (it could be done with git archive
and export-subst attribute) and there are not many benefits in having them in
the first place, just remove all these lines.

If nothing else, this will make an eventual transition to Git simpler.

Closes #14487.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74602 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-07-26 16:02:46 +00:00
Paul Cornett
5e1f70e13f avoid using deprecated gdk_cursor_unref() with GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72926 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-11-08 17:34:04 +00:00
Paul Cornett
9dc44eff02 support for GTK3
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-06-30 20:39:06 +00:00
Paul Cornett
2e952cd113 simplify global cursor setting
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68685 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-13 16:17:59 +00:00
Dimitri Schoolwerth
a1b806b982 Replaced Ok() occurrences with IsOk() throughout trunk.
Additionally renamed wxOSX' private wxNativePrinterDC::Ok() function to IsOk().

Didn't deprecate the various Ok() functions: given the amount of changes already introduced in 3.0 a trivial one like this seems more suitable for after 3.0.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67681 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-05-03 16:29:04 +00:00
Paul Cornett
385e8575dd avoid deprecated functions and direct struct access
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-03-28 06:27:49 +00:00
Vadim Zeitlin
51bf928d02 Fail instead of crashing in wxGTK wxCursor::CloneGDIRefData().
CloneGDIRefData() used wxCursorRefData copy ctor which wasn't implemented
correctly and simply copied its internal m_cursor member without incrementing
its reference count which resulted in a crash when it was then dereferenced
twice.

Unfortunately there doesn't seem to be any simple way to clone GDK cursors but
as this should be something only rarely (if ever?) needed, simply don't
implement CloneGDIRefData() at all for now and just leave an assert in it if
it's ever really called. Also don't define wxCursorRefData copy ctor at all as
it can't be done correctly.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66371 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-12-14 18:43:25 +00:00
Vadim Zeitlin
833fb475ce No real changes, just rearrange wxCursor::InitFromImage() in wxGTK.
Make it more clear that the function deals with two cases by using if/else
instead of if+return.

Also use smart wxGtkObject pointer instead of calling g_object_unref()
manually.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 18:39:16 +00:00
Vadim Zeitlin
5a9dd92128 Correct creation of the mask for wxImage cursors in wxGTK.
The code created the monochrome bitmap used by wxCursor(wxImage) ctor
incorrectly resulting in bad cursor appearance. Use the right values for
foreground and background pixels (which are inversed compared to naive
expectations) to fix this.

Closes #11989.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65107 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-07-25 18:39:10 +00:00
Robert Roebling
c2246a3881 Applied patch, fixes #12090: wxGTK cursor handling revamp
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-05-26 17:37:55 +00:00
Vadim Zeitlin
03647350fc No changes, just removed hard tabs and trailing white space.
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-08-21 10:41:26 +00:00
Francesco Montorsi
a4afdcf342 fix typo from previous commit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-16 13:24:33 +00:00
Francesco Montorsi
d6764050d8 fix the wxCursor(const wxString& cursor_file, ...) ctor by reusing wxImage ctor; fix doxygen rendering of that ctor docs
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60648 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-05-16 10:42:48 +00:00
Vadim Zeitlin
d3b9f782ef don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-01-19 13:55:27 +00:00
Vadim Zeitlin
5c33522fca replace wx_{const,static,reinterpret}_cast with their standard C++ equivalents
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56644 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-02 02:39:52 +00:00
Francesco Montorsi
cfaf8bd177 fix for non-PCH builds
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55889 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-25 18:36:16 +00:00
Francesco Montorsi
0ef5b1dad1 provide backward-compat wxCursor(int) ctor; remove empty stubs of XBM ctor from all ports except gtk,motif; make all ports emit wxLogError on invalid bitmap types; implement wxCursor(const wxString&, ...) ctor on GTK (not tested yet)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-25 17:56:07 +00:00
Francesco Montorsi
d4f392ea20 use wxStockCursor (as documented and as already implemented in wxMotif) instead of a plain 'int'
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55837 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-24 19:40:13 +00:00
Paul Cornett
df8d50a0a1 fix for infinite loop when wxBeginBusyCursor is called from idle handler, #1547
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-09-05 05:57:03 +00:00
Václav Slavík
6e63b5c9d8 Fixed wxCURSOR_HAND to map to GDK_HAND2 and not GDK_HAND1, for consistency with other applications
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-27 15:28:27 +00:00
Paul Cornett
e60f8377be fix for last commit: didn't work if mask was white
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-03 06:58:11 +00:00
Paul Cornett
8805143613 Fix wxCursor(wxImage&) ctor for image widths not a multiple of 8, and finding second-most frequent color.
Simplify color cursor code.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-03 05:28:22 +00:00
Paul Cornett
0c0f973fd8 fix leak when creating wxCURSOR_BLANK
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-31 06:45:20 +00:00
Vadim Zeitlin
8f884a0dcc Fix Ok/IsOk() mess in wxGDIObject-derived classes; also added
wxGDIObject::Create/CloneGDIRefData() and implemented them for (almost) all
ports


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50727 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-15 17:54:20 +00:00
Vadim Zeitlin
57b10cb4eb use GDK_SIZING instead of GDK_FLEUR which looks more like the cursor used for moving than for sizing (replaces patch 1830348)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-13 17:11:12 +00:00
Vadim Zeitlin
ff654490b7 removed all compile- and run-time checks for GTK+ < 2.4; don't include the generic files which are now never used in wxGTK in the build
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-11-05 22:31:24 +00:00
Paul Cornett
b541538fa5 move definitions from src/gtk/data.cpp to other appropriate places
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-05 19:49:02 +00:00
Paul Cornett
a1abca322f Reorganize idle system code.
Installing idle handler from GTK callbacks is no longer necessary.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45537 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-19 16:58:07 +00:00
Robert Roebling
cb738b8baf pixbuf cursor support is for GTK 2.4.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-11 09:27:28 +00:00
Vadim Zeitlin
9f556d1dd6 added support for colour cursors in wxGTK (patch 1655576)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-11 03:02:34 +00:00
Vadim Zeitlin
55ccdb93e4 COW cleanup patch (1583966):
1. perform deep comparison for the classes for which it makes sense in the
   ports where this wasn't done yet
2. remove (shallow) comparison operators for the classes for which it does
   not make sense (such as wxBitmap)
3. makes wxBitmap use COW on all ports
4. adds wxObject::IsRefTo()
5. centralizes and improves COW docs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-30 19:26:48 +00:00
Vadim Zeitlin
b7cacb43db add IsOk() to all classes having Ok() method (patch 1570985)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-10-08 21:56:55 +00:00
Paul Cornett
5ff14574fc some app.h cleanup: minimize includes, use static cast
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41099 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-09 17:29:19 +00:00
Vadim Zeitlin
d3c7fc996a mark all dtors which are virtual because base class dtor is virtual explicitly virtual themselves
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41020 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-05 20:47:48 +00:00
Robert Roebling
302dc5180a Correct sizing cursor.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40949 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-01 16:06:30 +00:00
Paul Cornett
0416c41834 header includes cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40923 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-30 05:55:56 +00:00
Paul Cornett
4f558e23ff build fix for older gtk2, second attempt
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39769 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-18 03:37:24 +00:00
Paul Cornett
086b047624 build fix for older gtk2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-06-17 21:09:53 +00:00
Mart Raudsepp
3fe39b0ce3 Don't cast with G_OBJECT when passing a GObject to g_object_ref, g_object_unref and g_signal_connect.
They take a gpointer, not GObject*, and unnecessary casting not all that speedy with GObject types.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-15 14:17:38 +00:00
Włodzimierz Skiba
de6185e212 Include wx/utils.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-02 10:39:23 +00:00
Włodzimierz Skiba
670f993563 Include wx/app.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38945 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-28 12:44:37 +00:00
Vadim Zeitlin
f516d98637 create stock GDI objects on demand; use const with GDI objects appropriately (patch 1445355)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-16 22:18:29 +00:00
Mart Raudsepp
bc8b8220f8 gdk_cursor_destroy -> gdk_cursor_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 18:19:55 +00:00
Mart Raudsepp
f5af73080a And gdk_drawable_unref is in turn deprecated in favor of g_object_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38547 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 14:06:00 +00:00
Mart Raudsepp
f368b5b9ab gdk_bitmap/pixmap_unref -> gdk_drawable_unref
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-04-04 13:54:02 +00:00