aboutsummaryrefslogtreecommitdiffstats
path: root/lib/wx/api_gen/wxapi.conf
diff options
context:
space:
mode:
authorDan Gudmundsson <[email protected]>2014-03-28 10:16:51 +0100
committerDan Gudmundsson <[email protected]>2014-03-28 10:16:51 +0100
commit7811310ee2c72173824007d3db73ae2b62a725d9 (patch)
tree3ed1b81ed09a5230551dbb2aca7135a0942735bf /lib/wx/api_gen/wxapi.conf
parente3f9bf8dbfe4e055753f04125406d29af0ae1050 (diff)
parentc15c7c6b2117320aa5feb2c77781634d055cfcd7 (diff)
downloadotp-7811310ee2c72173824007d3db73ae2b62a725d9.tar.gz
otp-7811310ee2c72173824007d3db73ae2b62a725d9.tar.bz2
otp-7811310ee2c72173824007d3db73ae2b62a725d9.zip
Merge branch 'dgud/wx/fix-wx3-windows64'
* dgud/wx/fix-wx3-windows64: wx: Send destroy message direct wx: Add wxLocale class wx: Added misc functions wx: Fix memory garbage collector wx: Fix possibility to fetch early open msgs on mac wx: Fix listCtrl sort callback wx: Fix configure for win64 with wxWidgets-3.0
Diffstat (limited to 'lib/wx/api_gen/wxapi.conf')
-rw-r--r--lib/wx/api_gen/wxapi.conf19
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/wx/api_gen/wxapi.conf b/lib/wx/api_gen/wxapi.conf
index 73c5af43d8..3a1dcc7ba5 100644
--- a/lib/wx/api_gen/wxapi.conf
+++ b/lib/wx/api_gen/wxapi.conf
@@ -1577,9 +1577,14 @@
'wxShutdown', {'wxShell', 1}, 'wxLaunchDefaultBrowser',
{'wxGetEmailAddress',0}, {'wxGetUserId',0}, {'wxGetHomeDir',0},
'wxNewId', 'wxRegisterId', 'wxGetCurrentId',
- 'wxGetOsDescription', 'wxIsPlatformLittleEndian', 'wxIsPlatform64Bit'
+ 'wxGetOsDescription', 'wxIsPlatformLittleEndian', 'wxIsPlatform64Bit'
]}.
+{class, gdicmn, static, [],
+ [ {'wxDisplaySize', [{"width", [out]}, {"height", [out]}]}, 'wxSetCursor'
+ ]}.
+
+
{class, wxPrintout, object, [{alias, [{wxePrintout, wxePrintout}]}],
[{'wxPrintout', [{where, taylormade}]},'~wxPrintout',
'GetDC', %% 'GetPageInfo',Callback
@@ -1885,3 +1890,15 @@
wxEVT_TASKBAR_LEFT_DCLICK,wxEVT_TASKBAR_RIGHT_DCLICK]}],[]}.
{class, wxInitDialogEvent, wxEvent, [{event,[wxEVT_INIT_DIALOG]}], []}.
+
+{class, wxLocale, root, [{skip, [{'wxLocale', 5}, {'Init', 6}]}],
+ ['wxLocale', '~wxLocale', 'Init',
+ 'AddCatalog','AddCatalogLookupPathPrefix',
+ %%'AddLanguage','FindLanguageInfo', 'GetLanguageInfo',
+ 'GetCanonicalName','GetLanguage',
+ 'GetLanguageName','GetLocale','GetName','GetString',
+ 'GetHeaderValue',
+ 'GetSysName',
+ 'GetSystemEncoding','GetSystemEncodingName',
+ 'GetSystemLanguage',
+ 'IsLoaded','IsOk']}.