mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-07 04:20:07 +01:00
Merge branch 'little-tweaks'
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -10,7 +10,6 @@
|
||||
import etgtools
|
||||
import etgtools.tweaker_tools as tools
|
||||
from etgtools import PyFunctionDef, PyCodeDef, PyPropertyDef
|
||||
import sys
|
||||
|
||||
PACKAGE = "wx"
|
||||
MODULE = "_core"
|
||||
@@ -207,8 +206,11 @@ def run():
|
||||
c.addProperty('UseBestVisual GetUseBestVisual SetUseBestVisual')
|
||||
c.addProperty('TopWindow GetTopWindow SetTopWindow')
|
||||
|
||||
if sys.platform != 'linux':
|
||||
c.find('GTKSuppressDiagnostics').ignore()
|
||||
c.find('GTKSuppressDiagnostics').setCppCode("""\
|
||||
#ifdef __WXGTK__
|
||||
GTKSuppressDiagnostics(flags);
|
||||
#endif
|
||||
""")
|
||||
|
||||
#-------------------------------------------------------
|
||||
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
# License: wxWindows License
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
import sys
|
||||
|
||||
import etgtools
|
||||
import etgtools.tweaker_tools as tools
|
||||
|
||||
@@ -151,9 +149,12 @@ def parseAndTweakModule():
|
||||
c.find('EnableProofCheck').ignore()
|
||||
c.find('GetProofCheckOptions').ignore()
|
||||
|
||||
# This function only exists on OSX
|
||||
if sys.platform != 'darwin':
|
||||
c.find('OSXEnableNewLineReplacement').ignore()
|
||||
# This method exists only on OSX
|
||||
c.find('OSXEnableNewLineReplacement').setCppCode("""\
|
||||
#ifdef __WXMAC__
|
||||
self->OSXEnableNewLineReplacement(enable);
|
||||
#endif
|
||||
""")
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -794,7 +794,9 @@ class Paragraph(Node):
|
||||
section = Section(element, None, self.kind)
|
||||
|
||||
root = self.GetTopLevelParent()
|
||||
root.AddSection(section)
|
||||
# TODO: Why is there sometimes not a top-level parent node?
|
||||
if root is not None:
|
||||
root.AddSection(section)
|
||||
|
||||
else:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user