Various fixes to let wxpython-cffi run with wxpython-3.0.2 on gtk2.

Author: amauryfa

README.rst

@@ -15,7 +15,7 @@ To get started:
     wxPython mailing lists if this does not work for you.
 
 3.  Make sure you have the wxWidgets code built in build/wxbld by running 
-    ``./builld.py build_wx``. 
+    ``./build.py build_wx``. 
 
 4.  Run the etg scripts: ``./build.py etg --generator=cffi --nodoc``
     (``--nodoc`` may not be necessary for you, but I never got the sphinx

etg/cffi/dataobj.py

@@ -430,19 +430,4 @@ def run(module):
 
     #------------------------------------------------------------
     c = module.find('wxURLDataObject')
-
-    # We need to let the generator know that the pure virtuals in the base
-    # class have impelmentations here even though they will not be used much
-    # (if at # all.) Those that are overridden in this class with different
-    # signatures we'll just mark as private to help avoid confusion.
-    c.addMethod('size_t', 'GetDataSize', '(const wxDataFormat& format)',
-                isVirtual=True, isConst=True, protection='private')
-    c.addMethod('bool', 'GetDataHere', '(const wxDataFormat& format, void* buf)',
-                isVirtual=True, isConst=True, protection='private')
-    c.addMethod('bool', 'SetData',
-                '(const wxDataFormat& format, size_t len, const void* buf)',
-                isVirtual=True, protection='private')
-
     addGetAllFormats(c)
-    add_GetDataHere_without_format(c)
-    add_SetData_without_format(c)

etg/dataobj.py

@@ -30,6 +30,10 @@
            ]
 
 
+OTHERDEPS = [ 'etg/sip/dataobj.py',
+              'etg/cffi/dataobj.py',
+            ]
+
 #---------------------------------------------------------------------------
 
 def run():
@@ -128,14 +132,6 @@ def run():
     # denominator approach here to be able to work on all platforms.
     c.bases = ['wxDataObject']
 
-    #c.addItem(etgtools.WigCode(code="""\
-    #    virtual size_t GetFormatCount(Direction dir = Get) const;
-    #    virtual wxDataFormat GetPreferredFormat(Direction dir = Get) const;
-    #    private:
-    #    virtual size_t GetDataSize(const wxDataFormat& format) const;
-    #    virtual bool GetDataHere(const wxDataFormat& format, void* buf) const;
-    #    virtual bool SetData(const wxDataFormat& format, size_t len, const void* buf);
-    #    """))
     c.addMethod('size_t', 'GetFormatCount', '(Direction dir = Get)',
                 isConst=True, isVirtual=True)
     c.addMethod('wxDataFormat', 'GetPreferredFormat', '(Direction dir = Get)',

etg/menuitem.py

@@ -99,6 +99,15 @@ def run():
         """)
 
 
+    c.find('GetBitmap').type = 'const wxBitmap*'
+    c.find('GetBitmap').setCppCode("""\
+        #ifdef __WXMSW__
+            return &self->GetBitmap(checked);
+        #else
+            return &self->GetBitmap();
+        #endif
+        """)
+ 
     c.find('SetBitmap').setCppCode("""\
         #ifdef __WXMSW__
             self->SetBitmap(*bmp, checked);
@@ -116,6 +125,22 @@ def run():
         """)
 
 
+    c.find('GetDisabledBitmap').type = 'const wxBitmap*'
+    c.find('GetDisabledBitmap').setCppCode("""\
+        #ifdef __WXMSW__
+            return &self->GetDisabledBitmap();
+        #else
+            return &wxNullBitmap;
+        #endif
+        """)
+    
+    c.find('SetDisabledBitmap').setCppCode("""\
+        #ifdef __WXMSW__
+            self->SetDisabledBitmap(*disabled);
+        #endif
+        """)
+
+
     c.find('GetAccel').factory = True
     c.find('GetAccelFromString').ignore()  # Not implemented anywere?
 

etg/utils.py

@@ -23,7 +23,7 @@
            'wxVersionInfo',
            ]
 
-OTHERDEPS = [ 'etg/sip/utils.py',
+OTHERDEPS = [ # 'etg/sip/utils.py',
               'etg/cffi/utils.py',
             ]
 #---------------------------------------------------------------------------

etgtools/cffi/module.py

@@ -157,7 +157,7 @@ def write_files(self, pyfile, userpyfile, cppfile, hfile, verify_args):
         pyfile.write(nci("""\
         ''')
         ffi.cdef(cdefs)
-        clib = ffi.verify(cdefs, %s)
+        clib = ffi.verify('#include <stdlib.h>\\n' + cdefs, %s)
         del cdefs
 
         wrapper_lib.populate_clib_ptrs(clib)

src/cffi/app_ex.h

@@ -23,6 +23,7 @@ class wxPyApp : public wxApp
     virtual void MacOpenURL(const wxString &) {}
     virtual void MacPrintFile(const wxString &) {}
     virtual void MacReopenApp() {}
+    virtual bool OSXIsGUIApplication() { return true; }
 #endif
 
 #ifdef __WXMAC__