X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e81b607b4322af54190484aa7ee34112337a344e..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/src/_app.i

diff --git a/wxPython/src/_app.i b/wxPython/src/_app.i
index 27790ba05e..91d1a8fb8b 100644
--- a/wxPython/src/_app.i
+++ b/wxPython/src/_app.i
@@ -47,9 +47,7 @@ DocStr(wxPyApp,
 class wxPyApp : public wxEvtHandler {
 public:
 
-    %pythonAppend wxPyApp
-       "self._setCallbackInfo(self, PyApp, False)
-        self._setOORInfo(self, False)";
+    %pythonAppend wxPyApp    "self._setOORInfo(self, False);" setCallbackInfo(PyApp)
     %typemap(out) wxPyApp*;    // turn off this typemap
 
     DocStr(wxPyApp,
@@ -67,7 +65,7 @@ public:
     %typemap(out) wxPyApp* { $result = wxPyMake_wxObject($1, $owner); }
 
 
-    void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, bool incref=false);
 
 
     DocDeclStr(
@@ -267,13 +265,13 @@ systems where more than one is available, (Sun, SGI, XFree86 4, etc.)", "");
         "Get the current OnAssert behaviour setting.", "");
 
 
-    static bool GetMacSupportPCMenuShortcuts();
+    static bool GetMacSupportPCMenuShortcuts();  // TODO, deprecate this
     static long GetMacAboutMenuItemId();
     static long GetMacPreferencesMenuItemId();
     static long GetMacExitMenuItemId();
     static wxString GetMacHelpMenuTitleName();
 
-    static void SetMacSupportPCMenuShortcuts(bool val);
+    static void SetMacSupportPCMenuShortcuts(bool val);  // TODO, deprecate this
     static void SetMacAboutMenuItemId(long val);
     static void SetMacPreferencesMenuItemId(long val);
     static void SetMacExitMenuItemId(long val);
@@ -297,7 +295,7 @@ it wasn't found at all.  Raises an exception on non-Windows platforms.", "");
 #endif
 
     %extend {
-        DocStr(DisplayAvailable,
+        DocStr(IsDisplayAvailable,
                "Tests if it is possible to create a GUI in the current environment.
 This will mean different things on the different platforms.
 
@@ -312,10 +310,24 @@ This will mean different things on the different platforms.
 
    * On MS Windows...
 ", "");
-        static bool DisplayAvailable() {
+        static bool IsDisplayAvailable() {
             return wxPyTestDisplayAvailable();
         }
     }
+
+    
+    %property(AppName, GetAppName, SetAppName, doc="See `GetAppName` and `SetAppName`");
+    %property(AssertMode, GetAssertMode, SetAssertMode, doc="See `GetAssertMode` and `SetAssertMode`");
+    %property(ClassName, GetClassName, SetClassName, doc="See `GetClassName` and `SetClassName`");
+    %property(ExitOnFrameDelete, GetExitOnFrameDelete, SetExitOnFrameDelete, doc="See `GetExitOnFrameDelete` and `SetExitOnFrameDelete`");
+    %property(LayoutDirection, GetLayoutDirection, doc="See `GetLayoutDirection`");
+    %property(PrintMode, GetPrintMode, SetPrintMode, doc="See `GetPrintMode` and `SetPrintMode`");
+    %property(TopWindow, GetTopWindow, SetTopWindow, doc="See `GetTopWindow` and `SetTopWindow`");
+    %property(Traits, GetTraits, doc="See `GetTraits`");
+    %property(UseBestVisual, GetUseBestVisual, SetUseBestVisual, doc="See `GetUseBestVisual` and `SetUseBestVisual`");
+    %property(VendorName, GetVendorName, SetVendorName, doc="See `GetVendorName` and `SetVendorName`");
+
+    %property(Active, IsActive);
 };