Commit Graph

59 Commits

Author SHA1 Message Date
Manuel Martin
b28dd88994 Improve new wxGLCanvas compatibility with old hardware and code
Combined patch with the following changes:
- Don't add wxGLAttributes::Defaults() when the attributes-list is NULL.
- Add display default attributes used in wx versions before 3.1 when the
  attributes-list is NULL. These attributes are different for each platform.
- Fix wxMSW PixelFormatDescriptor initialization.
- Don't set color buffers when RGBA() is used.
- Fix setting colour sizes in OS X and a few other fixes.
- Make documentation more clear about these subjects.

Closes #17425.
2017-01-16 03:25:49 +01:00
Maarten Bent
e2fb055329 Fix crash in OpenGL pyramid example if context creation fails
Initialize context pointers to null so that we don't delete uninitialized junk
later.

See #16910.

Closes https://github.com/wxWidgets/wxWidgets/pull/233
2016-02-26 13:00:51 +01:00
Manuel Martin
bdc95f5766 Improve wxGLCanvas to be more type safe and better support modern OpenGL
Add wxGLAttribsBase, wxGLAttributes and wxGLContextAttrs replacing the old
untyped "int attributes[]".

Don't use global object for creating OpenGL > 3.0 contexts.

Closes #16909.
2016-02-23 00:32:54 +01:00
Vadim Zeitlin
73119a37ae Remove obsolete _EXPORT macro not used under Win32.
This was a leftover from bad old Win16 days.
2015-07-05 16:55:26 +02:00
Dimitri Schoolwerth
8f8d58d193 Use wx-prefixed macros throughout the repository.
Change {DECLARE,IMPLEMENT}_*CLASS and {DECLARE,BEGIN,END}_EVENT_TABLE
occurrences to use the wx-prefixed version of the macros.
2015-04-23 22:00:35 +04:00
Vadim Zeitlin
74421a7f35 Fix creating wxGLCanvas without any attributes in wxMSW.
This was broken by the changes of r77018, see #16402.

Just check that we do have the attributes before examining them.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77072 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-15 12:14:06 +00:00
Vadim Zeitlin
3c7ba39135 Allow requesting core OpenGL profile and explicit OpenGL version.
Add WX_GL_CORE_PROFILE and WX_GL_{MAJOR,MINOR}_VERSION attributes which can be
used to use modern OpenGL with wxGLCanvas.

Closes #16402.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77018 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2014-08-06 23:31:41 +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
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
Dimitri Schoolwerth
e38f5435fb compilation fixes for wxMSW compilation with wxUSE_PALETTE set to 0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66581 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2011-01-04 19:00:10 +00:00
Vadim Zeitlin
af6da66ce3 Correctly recognize when wglChoosePixelFormatARB() fails.
This function returns TRUE even if it failed to find any matching formats, so
test not only its return value but also the number of formats it found.

Closes #12474.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65575 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2010-09-20 13:15:21 +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
43b2d5e7c3 Put braces around all calls to wxLogFunctions() inside an if statement.
This suppresses all the remaining g++ -Wparentheses warnings and uses consistent style everywhere.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61475 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2009-07-20 16:47:54 +00:00
Vadim Zeitlin
d9698bd4ac cleanup the Win32 window classes registration code: remove global variables and register the window classes we use on demand to avoid registering MDI or GL classes unnecessarily
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-29 22:19:55 +00:00
Vadim Zeitlin
82bf63a08c recreate the window if FSAA is requested (changeset_r54022_Fix.patch from #9145)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54202 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-14 01:44:13 +00:00
Vadim Zeitlin
c39d2e0a38 added multisampling (anti-aliasing) support to wxGLCanvas (#9145)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-06-08 00:12:12 +00:00
Vadim Zeitlin
4aa59c3df6 no real changes, clarified the usage of WX_GL_DOUBLEBUFFER; documented it and other WX_GL_XXX constants lost during doxygen transition; simplified wxMSW code a bit
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-27 12:46:28 +00:00
Vadim Zeitlin
77a96c6742 log error before returning, not after
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52970 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-04-02 00:10:58 +00:00
Vadim Zeitlin
a6b4b834b1 don't delete the context in ~wxGLCanvas(), the base class will do it (patch 1912776)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-03-14 23:57:30 +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
5ec69e9666 made SetCurrent() and SwapBuffers() return boolean status indicator instead of void (slightly modified patch 1844090)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-12-22 15:48:03 +00:00
Vadim Zeitlin
dc3065a56f Big wxGL classes refactoring/cleanup:
1. Provide the same API, especially, but not limited to, wxGLCanvas and
   wxCLContext ctors (which were completely different in all ports)
2. Extracted common parts into wxGLCanvas/ContextBase classes
3. Deprecate the old API using implicitly created wxGLContext


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45388 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-04-10 17:38:55 +00:00
Vadim Zeitlin
f4322df68b no changes, just removed TABs/trailing spaces
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-03-07 22:56:34 +00:00
Robert Roebling
b7ea712cc2 Commit Carsten Fuchs' patch for separating wxGLCanvas
and wxGLContext on GTK and MSW.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-06 13:31:20 +00:00
Włodzimierz Skiba
02761f6cd4 Include wx/module.h according to precompiled headers of wx/wx.h (with other minor cleaning).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40943 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-08-31 19:31:43 +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
2d918775fa document that SetCurrent() must be called on a visible window; assert that this is the case
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34454 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 15:01:31 +00:00
Julian Smart
3103e8a97e Typo correction patch [ 1208110 ] Lots of typo corrections
Olly Betts


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34436 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-05-31 09:20:43 +00:00
Włodzimierz Skiba
b8ee9a863c Quiet cooperation between MSW and wxGL.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-10-15 15:29:31 +00:00
Vadim Zeitlin
53fcd32e57 unregister GL windows classes on program termination, fixes problem with wx being used in a DLL which is being unloaded and reloaded again
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29051 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-09-08 12:00:12 +00:00
Włodzimierz Skiba
213ceb3f0e Source cleaning: whitespaces & tabs, ::, TRUE/true, FALSE/false.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28925 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-08-26 08:46:18 +00:00
Vadim Zeitlin
87b6002d7c typo/spelling fixes (patch 983448)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28164 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-04 11:19:47 +00:00
Vadim Zeitlin
e0176dd9fb font inheritance fixes (patch 983251)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28130 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-07-01 10:46:38 +00:00
Julian Smart
655719367a Use old licence name
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27408 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 20:53:33 +00:00
Julian Smart
77ffb5937e Name and version changes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-05-23 14:56:36 +00:00
Vadim Zeitlin
564a150b1f replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code cleanup here and there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-10-18 23:51:01 +00:00
Mattia Barbon
2341cf5f59 More warning fixes from ABX.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-09-10 21:09:11 +00:00
Václav Slavík
14f355c2b5 added support for gcc precompiled headers
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22723 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-09 12:46:53 +00:00
Mattia Barbon
234d8e9076 Compilation fix.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22591 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 19:55:49 +00:00
Václav Slavík
34fdf76231 added build options sanity checks into all main libraries
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22577 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-08-04 13:19:44 +00:00
Vadim Zeitlin
0e82bd9614 automatically link with opengl32.lib and glu32.lib when using VC++ (patch 753485)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21829 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-07-09 23:18:40 +00:00
Julian Smart
fe3d9123c6 Revamped border handling.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20511 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-06 21:57:32 +00:00
Vadim Zeitlin
2b5f62a0b2 merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-12-04 14:11:26 +00:00
Vadim Zeitlin
72adfc4ba7 fixed a compilation warning
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16240 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-07-21 18:46:50 +00:00
Vadim Zeitlin
af0b153364 fixed compilation without PCH
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15405 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-05-07 16:40:00 +00:00
Vadim Zeitlin
2b8646e07d HDC leak fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14708 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-03-21 18:59:36 +00:00
Vadim Zeitlin
6540eefca7 compilation fix after m_lDlgCode removal
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-02-06 13:41:28 +00:00
Václav Slavík
a756f21001 use the new wxSystemSettings API everywhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13471 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2002-01-08 23:53:01 +00:00
Vadim Zeitlin
d728116a27 compilation warning fix
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-16 12:07:18 +00:00
Vadim Zeitlin
2a4c85e755 removed code (re)setting the camera from wxGLCanvas::OnSize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12369 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2001-11-09 15:12:25 +00:00