Permalink
Browse files

Merge branch 'dgud/wx/misc-improvements/OTP-9947' into maint

* dgud/wx/misc-improvements/OTP-9947:
  [wx] Add simple taskbaricon test
  [wx] Add missing stc function
  [wx] Add wxTaskBarIcon class
  [wx] Doc overloaded functions
  [wx] Fix spec errors
  [wx] Fix api bugs in wxDC
  [wx] Fix wxGraphicContext bugs
  [wx] Remove redundant erts version check
  [wx] Generated types for all wx classes
  [wx] Generate GL api from latest version
  [wx] Cleanup Makefiles
  • Loading branch information...
dgud committed Feb 28, 2012
2 parents 6510ee4 + 6628dbe commit 77426493dc04593cc00c166e6fb17dd5fc985255
Showing with 37,297 additions and 20,634 deletions.
  1. +2 −0 lib/wx/.gitignore
  2. +5 −49 lib/wx/Makefile
  3. +0 −60 lib/wx/Notes
  4. +3 −32 lib/wx/README
  5. +0 −30 lib/wx/TODO
  6. +2 −2 lib/wx/api_gen/Makefile
  7. +12 −3 lib/wx/api_gen/README
  8. +9 −5 lib/wx/api_gen/gen_util.erl
  9. +7 −4 lib/wx/api_gen/gl_gen.erl
  10. +303 −129 lib/wx/api_gen/gl_gen_erl.erl
  11. +286 −0 lib/wx/api_gen/gl_scan_doc.erl
  12. +5 −3 lib/wx/api_gen/glapi.conf
  13. +13 −13 lib/wx/api_gen/wx_extra/wxEvtHandler.erl
  14. +7 −2 lib/wx/api_gen/wx_gen.erl
  15. +34 −3 lib/wx/api_gen/wx_gen_cpp.erl
  16. +232 −274 lib/wx/api_gen/wx_gen_erl.erl
  17. +40 −20 lib/wx/api_gen/wxapi.conf
  18. +1 −13 lib/wx/c_src/Makefile.in
  19. +465 −453 lib/wx/c_src/gen/gl_fdefs.h
  20. +231 −225 lib/wx/c_src/gen/gl_finit.h
  21. +1,554 −1,456 lib/wx/c_src/gen/gl_funcs.cpp
  22. +1 −1 lib/wx/c_src/gen/glu_finit.h
  23. +22 −1 lib/wx/c_src/gen/wxe_derived_dest.h
  24. +15 −1 lib/wx/c_src/gen/wxe_events.cpp
  25. +82 −56 lib/wx/c_src/gen/wxe_funcs.cpp
  26. +2,742 −2,736 lib/wx/c_src/gen/wxe_macros.h
  27. +11 −1 lib/wx/c_src/wxe_return.cpp
  28. +3 −1 lib/wx/c_src/wxe_return.h
  29. +14 −49 lib/wx/doc/src/Makefile
  30. +5 −21 lib/wx/examples/Makefile
  31. +9 −20 lib/wx/examples/demo/Makefile
  32. +8 −18 lib/wx/examples/simple/Makefile
  33. +9 −20 lib/wx/examples/sudoku/Makefile
  34. +1 −9 lib/wx/examples/xrc/Makefile
  35. +537 −6 lib/wx/include/gl.hrl
  36. +243 −196 lib/wx/include/wx.hrl
  37. +0 −302 lib/wx/install.es
  38. +1 −4 lib/wx/src/Makefile
  39. +14,259 −3,510 lib/wx/src/gen/gl.erl
  40. +575 −92 lib/wx/src/gen/glu.erl
  41. +29 −18 lib/wx/src/gen/wxAcceleratorEntry.erl
  42. +9 −5 lib/wx/src/gen/wxAcceleratorTable.erl
  43. +17 −7 lib/wx/src/gen/wxArtProvider.erl
  44. +3 −1 lib/wx/src/gen/wxAuiDockArt.erl
  45. +81 −49 lib/wx/src/gen/wxAuiManager.erl
  46. +31 −15 lib/wx/src/gen/wxAuiManagerEvent.erl
  47. +69 −31 lib/wx/src/gen/wxAuiNotebook.erl
  48. +15 −7 lib/wx/src/gen/wxAuiNotebookEvent.erl
  49. +221 −111 lib/wx/src/gen/wxAuiPaneInfo.erl
  50. +3 −1 lib/wx/src/gen/wxAuiTabArt.erl
  51. +92 −60 lib/wx/src/gen/wxBitmap.erl
  52. +39 −17 lib/wx/src/gen/wxBitmapButton.erl
  53. +18 −14 lib/wx/src/gen/wxBitmapDataObject.erl
  54. +8 −4 lib/wx/src/gen/wxBoxSizer.erl
  55. +34 −21 lib/wx/src/gen/wxBrush.erl
  56. +47 −31 lib/wx/src/gen/wxBufferedDC.erl
  57. +26 −19 lib/wx/src/gen/wxBufferedPaintDC.erl
  58. +30 −12 lib/wx/src/gen/wxButton.erl
  59. +76 −38 lib/wx/src/gen/wxCalendarCtrl.erl
  60. +68 −44 lib/wx/src/gen/wxCalendarDateAttr.erl
  61. +6 −4 lib/wx/src/gen/wxCalendarEvent.erl
  62. +41 −21 lib/wx/src/gen/wxCaret.erl
  63. +39 −20 lib/wx/src/gen/wxCheckBox.erl
  64. +23 −10 lib/wx/src/gen/wxCheckListBox.erl
  65. +5 −2 lib/wx/src/gen/wxChildFocusEvent.erl
  66. +32 −14 lib/wx/src/gen/wxChoice.erl
  67. +78 −36 lib/wx/src/gen/wxChoicebook.erl
  68. +13 −10 lib/wx/src/gen/wxClientDC.erl
  69. +30 −16 lib/wx/src/gen/wxClipboard.erl
  70. +17 −8 lib/wx/src/gen/wxCloseEvent.erl
  71. +19 −10 lib/wx/src/gen/wxColourData.erl
  72. +19 −10 lib/wx/src/gen/wxColourDialog.erl
  73. +35 −18 lib/wx/src/gen/wxColourPickerCtrl.erl
  74. +5 −2 lib/wx/src/gen/wxColourPickerEvent.erl
  75. +63 −29 lib/wx/src/gen/wxComboBox.erl
  76. +21 −10 lib/wx/src/gen/wxCommandEvent.erl
  77. +7 −3 lib/wx/src/gen/wxContextMenuEvent.erl
  78. +7 −3 lib/wx/src/gen/wxControl.erl
  79. +45 −22 lib/wx/src/gen/wxControlWithItems.erl
  80. +22 −15 lib/wx/src/gen/wxCursor.erl
  81. +241 −135 lib/wx/src/gen/wxDC.erl
  82. +3 −1 lib/wx/src/gen/wxDataObject.erl
  83. +5 −2 lib/wx/src/gen/wxDateEvent.erl
  84. +23 −10 lib/wx/src/gen/wxDatePickerCtrl.erl
  85. +45 −21 lib/wx/src/gen/wxDialog.erl
  86. +22 −9 lib/wx/src/gen/wxDirDialog.erl
  87. +31 −11 lib/wx/src/gen/wxDirPickerCtrl.erl
  88. +3 −1 lib/wx/src/gen/wxDisplayChangedEvent.erl
  89. +5 −2 lib/wx/src/gen/wxEraseEvent.erl
  90. +23 −11 lib/wx/src/gen/wxEvent.erl
  91. +14 −14 lib/wx/src/gen/wxEvtHandler.erl
  92. +9 −5 lib/wx/src/gen/wxFileDataObject.erl
  93. +44 −19 lib/wx/src/gen/wxFileDialog.erl
  94. +5 −2 lib/wx/src/gen/wxFileDirPickerEvent.erl
  95. +33 −11 lib/wx/src/gen/wxFilePickerCtrl.erl
  96. +19 −10 lib/wx/src/gen/wxFindReplaceData.erl
  97. +19 −10 lib/wx/src/gen/wxFindReplaceDialog.erl
  98. +39 −22 lib/wx/src/gen/wxFlexGridSizer.erl
  99. +5 −2 lib/wx/src/gen/wxFocusEvent.erl
  100. +59 −43 lib/wx/src/gen/wxFont.erl
  101. +33 −17 lib/wx/src/gen/wxFontData.erl
  102. +11 −6 lib/wx/src/gen/wxFontDialog.erl
  103. +33 −13 lib/wx/src/gen/wxFontPickerCtrl.erl
  104. +5 −2 lib/wx/src/gen/wxFontPickerEvent.erl
  105. +66 −30 lib/wx/src/gen/wxFrame.erl
  106. +3 −1 lib/wx/src/gen/wxGBSizerItem.erl
  107. +44 −16 lib/wx/src/gen/wxGLCanvas.erl
  108. +43 −19 lib/wx/src/gen/wxGauge.erl
  109. +59 −24 lib/wx/src/gen/wxGenericDirCtrl.erl
  110. +3 −1 lib/wx/src/gen/wxGraphicsBrush.erl
  111. +156 −111 lib/wx/src/gen/wxGraphicsContext.erl
  112. +3 −1 lib/wx/src/gen/wxGraphicsFont.erl
  113. +40 −26 lib/wx/src/gen/wxGraphicsMatrix.erl
  114. +14 −4 lib/wx/src/gen/wxGraphicsObject.erl
  115. +75 −49 lib/wx/src/gen/wxGraphicsPath.erl
  116. +3 −1 lib/wx/src/gen/wxGraphicsPen.erl
  117. +35 −16 lib/wx/src/gen/wxGraphicsRenderer.erl
  118. +522 −274 lib/wx/src/gen/wxGrid.erl
  119. +129 −81 lib/wx/src/gen/wxGridBagSizer.erl
  120. +49 −24 lib/wx/src/gen/wxGridCellAttr.erl
  121. +12 −7 lib/wx/src/gen/wxGridCellBoolEditor.erl
  122. +5 −3 lib/wx/src/gen/wxGridCellBoolRenderer.erl
  123. +12 −6 lib/wx/src/gen/wxGridCellChoiceEditor.erl
  124. +29 −14 lib/wx/src/gen/wxGridCellEditor.erl
  125. +11 −6 lib/wx/src/gen/wxGridCellFloatEditor.erl
  126. +19 −10 lib/wx/src/gen/wxGridCellFloatRenderer.erl
  127. +13 −7 lib/wx/src/gen/wxGridCellNumberEditor.erl
  128. +5 −3 lib/wx/src/gen/wxGridCellNumberRenderer.erl
  129. +7 −3 lib/wx/src/gen/wxGridCellRenderer.erl
  130. +5 −3 lib/wx/src/gen/wxGridCellStringRenderer.erl
  131. +7 −4 lib/wx/src/gen/wxGridCellTextEditor.erl
  132. +19 −9 lib/wx/src/gen/wxGridEvent.erl
  133. +29 −14 lib/wx/src/gen/wxGridSizer.erl
  134. +13 −9 lib/wx/src/gen/wxHelpEvent.erl
  135. +49 −25 lib/wx/src/gen/wxHtmlEasyPrinting.erl
  136. +5 −2 lib/wx/src/gen/wxHtmlLinkEvent.erl
  137. +62 −30 lib/wx/src/gen/wxHtmlWindow.erl
  138. +22 −15 lib/wx/src/gen/wxIcon.erl
  139. +25 −17 lib/wx/src/gen/wxIconBundle.erl
  140. +5 −2 lib/wx/src/gen/wxIconizeEvent.erl
  141. +18 −12 lib/wx/src/gen/wxIdleEvent.erl
  142. +288 −164 lib/wx/src/gen/wxImage.erl
  143. +53 −29 lib/wx/src/gen/wxImageList.erl
  144. +37 −18 lib/wx/src/gen/wxJoystickEvent.erl
  145. +31 −15 lib/wx/src/gen/wxKeyEvent.erl
  146. +23 −12 lib/wx/src/gen/wxLayoutAlgorithm.erl
  147. +43 −23 lib/wx/src/gen/wxListBox.erl
  148. +172 −96 lib/wx/src/gen/wxListCtrl.erl
  149. +29 −14 lib/wx/src/gen/wxListEvent.erl
  150. +57 −32 lib/wx/src/gen/wxListItem.erl
  151. +25 −13 lib/wx/src/gen/wxListItemAttr.erl
  152. +23 −11 lib/wx/src/gen/wxListView.erl
  153. +78 −36 lib/wx/src/gen/wxListbook.erl
  154. +5 −3 lib/wx/src/gen/wxLogNull.erl
  155. +31 −14 lib/wx/src/gen/wxMDIChildFrame.erl
  156. +17 −9 lib/wx/src/gen/wxMDIClientWindow.erl
  157. +40 −20 lib/wx/src/gen/wxMDIParentFrame.erl
  158. +25 −21 lib/wx/src/gen/wxMask.erl
  159. +3 −1 lib/wx/src/gen/wxMaximizeEvent.erl
  160. +17 −12 lib/wx/src/gen/wxMemoryDC.erl
  161. +197 −137 lib/wx/src/gen/wxMenu.erl
  162. +59 −30 lib/wx/src/gen/wxMenuBar.erl
  163. +9 −4 lib/wx/src/gen/wxMenuEvent.erl
  164. +65 −34 lib/wx/src/gen/wxMenuItem.erl
  165. +12 −5 lib/wx/src/gen/wxMessageDialog.erl
  166. +21 −9 lib/wx/src/gen/wxMiniFrame.erl
  167. +12 −9 lib/wx/src/gen/wxMirrorDC.erl
  168. +5 −2 lib/wx/src/gen/wxMouseCaptureChangedEvent.erl
  169. +85 −42 lib/wx/src/gen/wxMouseEvent.erl
  170. +5 −2 lib/wx/src/gen/wxMoveEvent.erl
  171. +16 −8 lib/wx/src/gen/wxMultiChoiceDialog.erl
  172. +19 −9 lib/wx/src/gen/wxNavigationKeyEvent.erl
  173. +3 −1 lib/wx/src/gen/wxNcPaintEvent.erl
  174. +84 −39 lib/wx/src/gen/wxNotebook.erl
  175. +11 −5 lib/wx/src/gen/wxNotebookEvent.erl
  176. +9 −4 lib/wx/src/gen/wxNotifyEvent.erl
  177. +14 −7 lib/wx/src/gen/wxPageSetupDialog.erl
  178. +71 −40 lib/wx/src/gen/wxPageSetupDialogData.erl
  179. +13 −10 lib/wx/src/gen/wxPaintDC.erl
  180. +3 −1 lib/wx/src/gen/wxPaintEvent.erl
  181. +18 −9 lib/wx/src/gen/wxPalette.erl
  182. +7 −3 lib/wx/src/gen/wxPaletteChangedEvent.erl
  183. +22 −10 lib/wx/src/gen/wxPanel.erl
  184. +13 −5 lib/wx/src/gen/wxPasswordEntryDialog.erl
  185. +36 −18 lib/wx/src/gen/wxPen.erl
  186. +35 −17 lib/wx/src/gen/wxPickerBase.erl
  187. +16 −12 lib/wx/src/gen/wxPostScriptDC.erl
  188. +3 −1 lib/wx/src/gen/wxPreviewCanvas.erl
  189. +20 −9 lib/wx/src/gen/wxPreviewControlBar.erl
  190. +21 −9 lib/wx/src/gen/wxPreviewFrame.erl
  191. +49 −31 lib/wx/src/gen/wxPrintData.erl
  192. +20 −14 lib/wx/src/gen/wxPrintDialog.erl
  193. +55 −28 lib/wx/src/gen/wxPrintDialogData.erl
  194. +45 −22 lib/wx/src/gen/wxPrintPreview.erl
  195. +28 −17 lib/wx/src/gen/wxPrinter.erl
  196. +44 −22 lib/wx/src/gen/wxPrintout.erl
  197. +22 −10 lib/wx/src/gen/wxProgressDialog.erl
  198. +7 −3 lib/wx/src/gen/wxQueryNewPaletteEvent.erl
  199. +76 −42 lib/wx/src/gen/wxRadioBox.erl
  200. +27 −11 lib/wx/src/gen/wxRadioButton.erl
  201. +90 −76 lib/wx/src/gen/wxRegion.erl
  202. +11 −8 lib/wx/src/gen/wxSashEvent.erl
  203. +37 −22 lib/wx/src/gen/wxSashLayoutWindow.erl
  204. +36 −20 lib/wx/src/gen/wxSashWindow.erl
  205. +11 −9 lib/wx/src/gen/wxScreenDC.erl
  206. +39 −17 lib/wx/src/gen/wxScrollBar.erl
  207. +7 −3 lib/wx/src/gen/wxScrollEvent.erl
  208. +7 −3 lib/wx/src/gen/wxScrollWinEvent.erl
  209. +46 −21 lib/wx/src/gen/wxScrolledWindow.erl
  210. +13 −6 lib/wx/src/gen/wxSetCursorEvent.erl
  211. +7 −3 lib/wx/src/gen/wxShowEvent.erl
  212. +18 −9 lib/wx/src/gen/wxSingleChoiceDialog.erl
  213. +5 −2 lib/wx/src/gen/wxSizeEvent.erl
  214. +244 −158 lib/wx/src/gen/wxSizer.erl
  215. +30 −16 lib/wx/src/gen/wxSizerFlags.erl
  216. +86 −48 lib/wx/src/gen/wxSizerItem.erl
  217. +45 −20 lib/wx/src/gen/wxSlider.erl
  218. +33 −14 lib/wx/src/gen/wxSpinButton.erl
  219. +49 −22 lib/wx/src/gen/wxSpinCtrl.erl
  220. +7 −3 lib/wx/src/gen/wxSpinEvent.erl
  221. +17 −8 lib/wx/src/gen/wxSplashScreen.erl
  222. +13 −6 lib/wx/src/gen/wxSplitterEvent.erl
  223. +77 −38 lib/wx/src/gen/wxSplitterWindow.erl
  224. +25 −11 lib/wx/src/gen/wxStaticBitmap.erl
  225. +21 −9 lib/wx/src/gen/wxStaticBox.erl
  226. +17 −12 lib/wx/src/gen/wxStaticBoxSizer.erl
  227. +26 −11 lib/wx/src/gen/wxStaticLine.erl
  228. +27 −12 lib/wx/src/gen/wxStaticText.erl
  229. +59 −29 lib/wx/src/gen/wxStatusBar.erl
  230. +15 −8 lib/wx/src/gen/wxStdDialogButtonSizer.erl
  231. +942 −472 lib/wx/src/gen/wxStyledTextCtrl.erl
  232. +50 −26 lib/wx/src/gen/wxStyledTextEvent.erl
  233. +3 −1 lib/wx/src/gen/wxSysColourChangedEvent.erl
  234. +19 −13 lib/wx/src/gen/wxSystemOptions.erl
  235. +18 −15 lib/wx/src/gen/wxSystemSettings.erl
  236. +102 −0 lib/wx/src/gen/wxTaskBarIcon.erl
  237. +64 −0 lib/wx/src/gen/wxTaskBarIconEvent.erl
  238. +66 −37 lib/wx/src/gen/wxTextAttr.erl
  239. +127 −59 lib/wx/src/gen/wxTextCtrl.erl
  240. +14 −8 lib/wx/src/gen/wxTextDataObject.erl
  241. +17 −7 lib/wx/src/gen/wxTextEntryDialog.erl
  242. +27 −11 lib/wx/src/gen/wxToggleButton.erl
  243. +181 −88 lib/wx/src/gen/wxToolBar.erl
  244. +16 −8 lib/wx/src/gen/wxToolTip.erl
  245. +78 −36 lib/wx/src/gen/wxToolbook.erl
  246. +61 −30 lib/wx/src/gen/wxTopLevelWindow.erl
  247. +215 −103 lib/wx/src/gen/wxTreeCtrl.erl
  248. +19 −9 lib/wx/src/gen/wxTreeEvent.erl
  249. +93 −43 lib/wx/src/gen/wxTreebook.erl
  250. +38 −23 lib/wx/src/gen/wxUpdateUIEvent.erl
  251. +508 −288 lib/wx/src/gen/wxWindow.erl
  252. +3 −1 lib/wx/src/gen/wxWindowCreateEvent.erl
  253. +13 −10 lib/wx/src/gen/wxWindowDC.erl
  254. +3 −1 lib/wx/src/gen/wxWindowDestroyEvent.erl
  255. +68 −35 lib/wx/src/gen/wxXmlResource.erl
  256. +44 −34 lib/wx/src/gen/wx_misc.erl
  257. +2,742 −2,737 lib/wx/src/gen/wxe_debug.hrl
  258. +2,741 −2,736 lib/wx/src/gen/wxe_funcs.hrl
  259. +80 −77 lib/wx/src/wx.erl
  260. +2 −9 lib/wx/src/wxe_master.erl
  261. +1 −11 lib/wx/test/Makefile
  262. +14 −2 lib/wx/test/wx_class_SUITE.erl
View
@@ -1,2 +1,4 @@
test_log_*
wx_test_case_info
api_gen/gl_man?
doc/html/*
View
@@ -1,19 +1,19 @@
#
# %CopyrightBegin%
#
# Copyright Ericsson AB 2008-2011. All Rights Reserved.
#
#
# Copyright Ericsson AB 2008-2012. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
# compliance with the License. You should have received a copy of the
# Erlang Public License along with this software. If not, it can be
# retrieved online at http://www.erlang.org/.
#
#
# Software distributed under the License is distributed on an "AS IS"
# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
# the License for the specific language governing rights and limitations
# under the License.
#
#
# %CopyrightEnd%
#
@@ -33,53 +33,9 @@ endif #TERTIARY_BOOTSTRAP
CLEANDIRS = $(SUBDIRS) api_gen
ifeq ($(INSIDE_ERLSRC),true)
# we are inside erl src
# ----------------------------------------------------
# Default Subdir Targets
# ----------------------------------------------------
SUB_DIRECTORIES=$(SUBDIRS)
include $(ERL_TOP)/make/otp_subdir.mk
else
# we are building standalone wxErlang
all: opt
opt:
@mkdir -p ebin
@mkdir -p priv
@mkdir -p c_src/$(SYS_TYPE)
@for d in $(SUBDIRS); do \
if test ! -d $$d ; then \
echo "=== Skipping subdir $$d" ; \
else \
(cd $$d && $(MAKE) $@) ; \
fi ; \
done
# clean, removes beam, object and target files
clean:
rm -f *~
@for d in $(CLEANDIRS); do \
if test ! -d $$d ; then \
echo "=== Skipping subdir $$d" ; \
else \
(cd $$d && $(MAKE) $@) ; \
fi ; \
done
docs:
(cd doc/src/ && $(MAKE) $@)
prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
install:
escript ./install.es $(INSTALLDIR)
release:
escript ./install.es --create_release
endif
View

This file was deleted.

Oops, something went wrong.
View
@@ -1,4 +1,3 @@
REQUIREMENTS:
At least Erlang-R13B with smp enabled. It Requires unicode support.
@@ -10,17 +9,11 @@ REQUIREMENTS:
And I have given up on Solaris-8|9, wxWidgets on my old gtk version
doesn't run well, 7 of 10 wxWidgets examples seg fault.
Some early tests show that Solaris 10 works, though.
INSTALLING:
The prebuilt (windows and mac) version can be installed by invoking:
install.es
or
/PATH/TO/ERL/bin/escript install.es
BUILDING:
You will need wxWidgets-2.8.*
On mac I built wxwidgets with:
On mac (snow leopard) I built wxwidgets with:
mkdir MYBUILD; cd MYBUILD
../configure --with-opengl --enable-unicode --enable-graphics_ctx \
@@ -30,6 +23,8 @@ BUILDING:
cd contrib/src/stc/
make && make install
Or grab them prebuilt from macports.
On linux I have used the wxwidgets-libraries that came with
the distribution. It requires wxStyledTextControl which was
prebuilt on my linux, otherwise you have to build wxWidgets
@@ -48,30 +43,6 @@ BUILDING:
I havn't tested on cygwin at all.
You need to use werl on windows, erl (non-gui) hangs wxwidgets startup.
make
should work if erl, gcc and g++ and wx-config is found in path.
HELPING:
See TODO list.
Use it, i.e. write code which tests the library, submit tests.
See api_gen/Readme for improving the code generation.
My C++ knowledge isn't the best, send patches and explain why
so I can learn something.
STATUS:
Testing I havn't done more testing than the code in test directory.
So please help by testing and writing test suites.
Most classes needs some argument tweaking (in wxapi.conf) to
work as expected, but I havn't read all the documentation and
gone through every argument on every function.
See (and run) the demo in the examples directory.
This library is (currently) a driver, so if the you (or I) make errors,
such as accessing deleted objects or other things wxWidgets didn't
expect you to do, erlang will crash hard.
Cheers
Dan Gudmundsson
View

This file was deleted.

Oops, something went wrong.
View
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
# Copyright Ericsson AB 2008-2010. All Rights Reserved.
# Copyright Ericsson AB 2008-2012. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
@@ -30,7 +30,7 @@ ERL_COMPILE_FLAGS=+debug_info +warn_unused_vars
COMPILER = gen_util wx_gen wx_gen_erl wx_gen_cpp
COMPILER_T = $(COMPILER:%=$(EBIN)/%.beam)
GL_COMP = gl_gen gl_gen_erl gl_gen_c
GL_COMP = gl_gen gl_gen_erl gl_gen_c gl_scan_doc
GL_COMP_T = $(GL_COMP:%=$(EBIN)/%.beam)
TARGET_EDIR = ../src/gen
View
@@ -1,6 +1,6 @@
API GENERATION:
Most of the code in wx is generated.
Users of wxErlang should not normally need to regenerate the generated code,
Most of the code in wx is generated.
Users of wxErlang should not normally need to regenerate the generated code,
as it is checked in by wxErlang developers, when changes are made.
Code checked in is currently generated from wxwidgets 2.8.10.
@@ -10,6 +10,8 @@ REQUIREMENTS:
used to parse wxWidgets c++ headers and generate xml files (in
wx_xml/).
2012-02-09 doxygen 1.7.4 is working fine
2008-09-29 doxygen 1.4.6 is required.
Later versions of Doxygen - up to 1.5.6 at least - have a bug in the xml generation
which causes us problems. This has been logged and we are waiting for a fix.
@@ -32,5 +34,12 @@ RUNNING:
I keep the opengl headers separate so I don't go backwards in version when generating the code
from another machine.
Also gl.h from different vendors differ so keep it consistent,
I have used mesa's gl.h and the glext.h from opengl.org
(version see GL_GLEXT_VERSION in gl.hrl)
I also get the xml documentation from opengl.org (subversion) and place it in
api_gen/gl_man2 (all old functions) and api_gen/gl_man4 (all the new functions).
CONTRIBUTION:
Send me patches or update the svn version.
Send me patches
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -96,8 +96,8 @@ check_diff(Diff) ->
[<<>>] -> ok;
_ -> throw(diff)
end,
<<_, _, "%% Copyright", _/binary>> = D1,
<<_, _, "%% Copyright", _/binary>> = D2,
copyright(D1),
copyright(D2),
copyright
catch
throw:_ -> diff;
@@ -108,6 +108,10 @@ check_diff(Diff) ->
diff
end.
copyright(<<_, _, "%% Copyright", _/binary>>) -> ok;
copyright(<<_, _, " * Copyright", _/binary>>) -> ok;
copyright(_) -> throw(diff).
w(Str) ->
w(Str, []).
w(Str,Args) ->
@@ -217,7 +221,7 @@ erl_copyright() ->
w("%%~n",[]),
w("%% %CopyrightBegin%~n",[]),
w("%%~n",[]),
w("%% Copyright Ericsson AB ~p-2011. All Rights Reserved.~n",
w("%% Copyright Ericsson AB ~p-2012. All Rights Reserved.~n",
[StartYear]),
w("%%~n",[]),
w("%% The contents of this file are subject to the Erlang Public License,~n",[]),
@@ -237,7 +241,7 @@ c_copyright() ->
w("/*~n",[]),
w(" * %CopyrightBegin%~n",[]),
w(" *~n",[]),
w(" * Copyright Ericsson AB 2008-2011. All Rights Reserved.~n",[]),
w(" * Copyright Ericsson AB 2008-2012. All Rights Reserved.~n",[]),
w(" *~n",[]),
w(" * The contents of this file are subject to the Erlang Public License,~n",[]),
w(" * Version 1.1, (the \"License\"); you may not use this file except in~n",[]),
View
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
%% Copyright Ericsson AB 2008-2012. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -62,11 +62,11 @@ gen_code() ->
GLDefs = parse_gl_defs(Opts),
{GLUDefines,GLUFuncs} = setup(GLUDefs, Opts),
{GLDefines,GLFuncs} = setup(GLDefs, Opts),
gl_gen_erl:gl_defines(GLDefines),
gl_gen_erl:gl_api(GLFuncs),
gl_gen_erl:glu_defines(GLUDefines),
gl_gen_erl:glu_api(GLUFuncs),
gl_gen_erl:gl_defines(GLDefines),
gl_gen_erl:gl_api(GLFuncs),
%%gl_gen_erl:gen_debug(GLFuncs,GLUFuncs),
gl_gen_c:gen(GLFuncs,GLUFuncs),
ok.
@@ -360,7 +360,9 @@ extract_type_info2("**", Acc) -> [{by_ref,{pointer,2}}|Acc];
extract_type_info2(Type, Acc) -> [Type|Acc].
parse_type2(["void"], _T, _Opts) -> void;
parse_type2([N="void"|R], T, Opts) ->
parse_type2([N="void", const|R], T, Opts) ->
parse_type2([const|R],T#type{name=N, base=idx_binary},Opts);
parse_type2([N="void"|R], T, Opts) ->
parse_type2(R,T#type{name=N},Opts);
parse_type2([const|R],T=#type{mod=Mod},Opts) ->
parse_type2(R,T#type{mod=[const|Mod]},Opts);
@@ -676,6 +678,7 @@ get_extension(ExtName,_Opts) ->
"IGP" ++ Name -> {reverse(Name),"PGI"};
"PH" ++ Name -> {reverse(Name),"HP"};
"YDEMERG" ++ Name -> {reverse(Name),"GREMEDY"};
"SEO" ++ Name -> {reverse(Name),"OES"};
%%["" ++ Name] -> {Name; %%
_ -> {ExtName, ""}
end.
Oops, something went wrong.

0 comments on commit 7742649

Please sign in to comment.