Commit Graph

37 Commits

Author SHA1 Message Date
Vadim Zeitlin
e709239889 Use wxHAS_IMAGES_IN_RESOURCES instead of explicit platform checks.
Add a special symbol which is defined only if the icons and other images (e.g.
cursor) are in the separate resource files and don't need to be embedded as
XPMs in the main program.

This makes the checks more clear and more customizable as it's enough to
change wxHAS_IMAGES_IN_RESOURCES definition instead of changing many platform
checks.

Closes #14050.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70789 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2012-03-04 00:28:58 +00:00
Vadim Zeitlin
97f851007c Fixes to OpenGL samples to avoid asserts/crashes.
Don't call wxGLCanvas::SetCurrent() when the window is not shown.

Closes #13424.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68909 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-08-27 12:13:13 +00:00
Vadim Zeitlin
e4545e0183 Allow to use space to toggle spinning of the cube in OpenGL sample.
Small enhancement to the cube OpenGL sample.

Closes #11545.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-10-24 22:40:58 +00:00
Vadim Zeitlin
ce00f59b5b No changes whatsoever, just remove trailing whitespace.
There are no real changes in this commit but it removes all trailing white
space from our source files. This avoids problems when applying patches and
making diffs and it would be nice to prevent it from reappearing.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65680 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-30 11:44:45 +00:00
Vadim Zeitlin
9a83f86094 Globally replace _T() with wxT().
Standardize on using a single macro across all wxWidgets sources and solve the name clash with Sun CC standard headers (see #10660).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61508 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-23 20:30:22 +00:00
Vadim Zeitlin
451c13c85c update the samples to use new (non-deprecated) wxGLCanvas API; added more comments; some cleanup (modified patch 1882679)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51630 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-10 13:26:01 +00:00
Vadim Zeitlin
3f20f7d8a3 added wxGLCanvas::IsDisplaySupported() (patch 1879906)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-02-03 14:55:05 +00:00
Vadim Zeitlin
0ce4fad6ae use IsShownOnScreen() in OnSize() to ensure that the window is realized (important for X11-based ports) before trying to create an associated context
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-15 23:09:46 +00:00
Vadim Zeitlin
e559e76ed9 added back SetCurrent() call accidentally removed in one of recent commits
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45481 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-15 15:23:05 +00:00
Vadim Zeitlin
bc521497d3 use slightly more light
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-15 15:21:25 +00:00
Vadim Zeitlin
378a3872eb use textures in the shared context to test how this works when using multiple windows with the same context
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45479 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-15 15:13:49 +00:00
Vadim Zeitlin
50f5d508a8 reorganized the code to put the logic in wxGLContext-derived class but keep the state in the window
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45476 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-15 00:54:32 +00:00
Vadim Zeitlin
1f602af615 rename the menu to avoid conflict with a standard Mac menu
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-10 16:51:52 +00:00
Vadim Zeitlin
264f22613c refresh GL canvas itself, not the frame, when the GL context changes, otherwise it doesn't redraw under wxGTK1
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45372 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-10 00:02:15 +00:00
Vadim Zeitlin
b94d29a7a1 fix the sample to work under X11 (where a context can't be made current before the window is realized)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45370 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-09 23:03:54 +00:00
Vadim Zeitlin
43c742d005 1. switched to new wxGLCanvas API (not using the implicit context)
2. pruned everything not related to OpenGL, making the remaining code much
   more readable
3. show using the same wxGLContext with multiple wxGLCanvases


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-09 22:54:40 +00:00
Vadim Zeitlin
45e6e6f8ab call OnInit() from all samples to allow using standard command line options with all of them (patch 1623971)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44354 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-02-04 00:34:18 +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
Vadim Zeitlin
8474a52c32 fix TestGLCanvas ctor (part of patch 1155132)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-27 18:08:08 +00:00
Włodzimierz Skiba
be51756712 Name conflict correction.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32600 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-03-04 19:19:19 +00:00
Julian Smart
3a9929405b Added wxFULL_REPAINT_ON_RESIZE and sample icon to OpenGL samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32394 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-02-26 20:03:27 +00:00
Kevin Hock
687706f5e7 Use event modifiers and accessors rather than m_ variables directly, which are now protected rather than public with 2.4 compatibility disabled
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-01-18 15:08:15 +00:00
Vadim Zeitlin
806e2f154a give an #error if wxUSE_GLCANVAS == 0 instead of building empty samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-13 21:19:38 +00:00
Julian Smart
be5a51fb59 More name changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27429 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-25 11:20:37 +00:00
Dimitri Schoolwerth
5cf036d017 Fixed Open Watcom compilation of OpenGL samples; Code cleanup.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24560 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-11-15 04:21:10 +00:00
Julian Smart
2db98bf520 Applied patch [ 802596 ] warning and error free Open GL samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-11 07:20:55 +00:00
Ron Lee
b1d4dd7add Split this out from other changes to keep things sane..
wxDeprecated KeyCode.
wxDeprecated old wxList compat methods.
Replaced a large number of them in the gtk build already, but there are
still plenty more so feel free to help nuke them as you find them.
s/^I/    / and s/TRUE/true/ etc. a couple of these too.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-13 05:17:41 +00:00
Ron Lee
12a3f2275c Deprecated wxSizer::Remove( wxWindow* ), s/Remove/Detach/ in most places.
Made wxSizer child list typesafe.  I've not added the wxList implicit
conversion kludge yet, let's see who complains first perhaps..

Deprecated wxSizer::{G,S}etOption in favour of {G,S}etProportion in line
with the parameter name change in the docs.

Added {G,S}etSpacer consistent with the accessors for windows/sizers.

Made all wxSizer index parameters size_t -- we support no sensible
interpretation for negative indexes in them.  Hopefully this will
cause no real problems, but code doing (eg. Remove( 0 )) will need
to change to use 0u to resolve the ambiguity with overloaded members.
This is probably a Good Thing though, ymmv.

s/FALSE/false/g ; s/TRUE/true/g ; s/wxASSERT/wxASSERT_MSG/g in sizer.{cpp,h}

Fixed (I hope) the brokenness in wxSizer::Show -- I have no code to test
this yet, so it's a blind change, but spacers should now be hidden correctly
instead of ignored, and it should be properly reversable over multiple
calls now too.

removed pointless private scoping around DECLARE_CLASS macros.

Replace 0's I added previously with NULL -- not like that will end the
email thread either..

Added Add( wxSizerItem * ) & co.  There are probably a couple of other
places we can usefully do something like this too.  Stopped short of
refactoring everything to raise some issues about sizer method recursion
on -dev.

Updated wxSizer docs some more, they are still incomplete but getting
better.

wrapped KeyCode in wxDEPRECATED, converted all (gtk build) instances
to GetKeyCode.  There may be a few left for other ports.

Fixed a couple of other random compile warnings along the way.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18616 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-01-07 10:22:07 +00:00
Gilles Depeyrot
788233da90 disable use of #pragma interface under Mac OS X
GNU compiler included with Mac OS X 10.2 (Jaguar) as well as August Developer
Tools update contain a bug concerning #pragma interface handling that can only
be worked around by not using them (and they are not necessary anyways)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16895 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-08-31 22:31:03 +00:00
Vadim Zeitlin
2f6c54eb07 patch from Dimitri fixing a few memory leaks and unTABbing the sources
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14660 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-17 14:16:03 +00:00
Gilles Depeyrot
9d705dfa81 applied SourceForge patch #479670 (fixes for OpenGL samples) by Paul Thiessen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-16 07:17:37 +00:00
Vadim Zeitlin
ec2995088d fixes for cube sample from Paul Thiessen
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11927 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-10-10 16:37:33 +00:00
Gilles Depeyrot
e195c8c95f correction for Mac OS compilation
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11146 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-07-22 14:23:55 +00:00
Vadim Zeitlin
f4a7108f73 fixed (?) bug 407974 (arrows not working)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-03-16 19:37:50 +00:00
Bryan Petty
f6bcfd974e merged 2.2 branch
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-07-15 19:51:35 +00:00
Julian Smart
5fa399c9e2 Made VC++ makefiles and project files a bit more consistent
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-03-08 08:32:31 +00:00
Julian Smart
8b089c5e8c Moved wxGLCanvas to more normal positions
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2000-02-28 08:22:57 +00:00