demo tweaks

[wxWidgets.git] / wxPython / src / _app.i

diff --git a/wxPython/src/_app.i b/wxPython/src/_app.i
index 299cb97ffc63711de205ebe83a121c65c18dca5a..0507835d35db089387d460f451bc9a4e82bc41ef 100644 (file)
--- a/wxPython/src/_app.i
+++ b/wxPython/src/_app.i
@@ -44,10 +44,12 @@ enum
 class wxPyApp : public wxEvtHandler {
 public:
 
 class wxPyApp : public wxEvtHandler {
 public:
 

-    %addtofunc wxPyApp
+    %pythonAppend wxPyApp

        "self._setCallbackInfo(self, PyApp)
         self._setOORInfo(self)";
 
        "self._setCallbackInfo(self, PyApp)
         self._setOORInfo(self)";
 

+    DocStr(wxPyApp,
+           "Create a new application object, starting the bootstrap process.");

     %extend {
         wxPyApp() {
             wxPythonApp = new wxPyApp();
     %extend {
         wxPyApp() {
             wxPythonApp = new wxPyApp();


@@ -66,7 +68,7 @@ public:
     DocDeclStr(
         void, SetAppName(const wxString& name),
         "Set the application name. This value may be used automatically\n"
     DocDeclStr(
         void, SetAppName(const wxString& name),
         "Set the application name. This value may be used automatically\n"

-        "by wxConfig and such.");
+        "by wx.Config and such.");

 
     DocDeclStr(
         wxString, GetClassName() const,
 
     DocDeclStr(
         wxString, GetClassName() const,


@@ -82,7 +84,7 @@ public:
     DocDeclStr(
         void, SetVendorName(const wxString& name),
         "Set the application's vendor name. This value may be used automatically\n"
     DocDeclStr(
         void, SetVendorName(const wxString& name),
         "Set the application's vendor name. This value may be used automatically\n"

-        "by wxConfig and such.");
+        "by wx.Config and such.");

 
 
     DocDeclStr(
 
 
     DocDeclStr(


@@ -90,13 +92,13 @@ public:
         "Create the app traits object to which we delegate for everything which either\n"
         "should be configurable by the user (then he can change the default behaviour\n"
         "simply by overriding CreateTraits() and returning his own traits object) or\n"
         "Create the app traits object to which we delegate for everything which either\n"
         "should be configurable by the user (then he can change the default behaviour\n"
         "simply by overriding CreateTraits() and returning his own traits object) or\n"

-        "which is GUI/console dependent as then wxAppTraits allows us to abstract the\n"
+        "which is GUI/console dependent as then wx.AppTraits allows us to abstract the\n"

         "differences behind the common facade");
 
 
     DocDeclStr(
         virtual void, ProcessPendingEvents(),
         "differences behind the common facade");
 
 
     DocDeclStr(
         virtual void, ProcessPendingEvents(),

-        "Process all events in the wxPendingEvents list -- it is necessary to call this\n"
+        "Process all events in the Pending Events list -- it is necessary to call this\n"

         "function to process posted events. This happens during each event loop\n"
         "iteration.");
 
         "function to process posted events. This happens during each event loop\n"
         "iteration.");
 


@@ -188,7 +190,7 @@ public:
         "Get the current exit behaviour setting.");
 
 #if 0 
         "Get the current exit behaviour setting.");
 
 #if 0 

-    // Get display mode that is used use. This is only used in framebuffer
+    // Get display mode that is in use. This is only used in framebuffer

     // wxWin ports (such as wxMGL).
     virtual wxVideoMode GetDisplayMode() const;
     
     // wxWin ports (such as wxMGL).
     virtual wxVideoMode GetDisplayMode() const;
     


@@ -222,10 +224,10 @@ public:
         "Set the OnAssert behaviour for debug and hybrid builds.  The following flags\n"
         "may be or'd together:\n"
         "\n"
         "Set the OnAssert behaviour for debug and hybrid builds.  The following flags\n"
         "may be or'd together:\n"
         "\n"

-        " wxPYAPP_ASSERT_SUPPRESS         Don't do anything\n"
-        " wxPYAPP_ASSERT_EXCEPTION        Turn it into a Python exception if possible (default)\n"
-        " wxPYAPP_ASSERT_DIALOG           Display a message dialog\n"
-        " wxPYAPP_ASSERT_LOG              Write the assertion info to the wxLog\n");
+        " wx.PYAPP_ASSERT_SUPPRESS         Don't do anything\n"
+        " wx.PYAPP_ASSERT_EXCEPTION        Turn it into a Python exception if possible (default)\n"
+        " wx.PYAPP_ASSERT_DIALOG           Display a message dialog\n"
+        " wx.PYAPP_ASSERT_LOG              Write the assertion info to the wx.Log\n");

     
     DocDeclStr(
         int,  GetAssertMode(),
     
     DocDeclStr(
         int,  GetAssertMode(),


@@ -257,7 +259,7 @@ public:
 #else
     %extend {
         static int GetComCtl32Version()
 #else
     %extend {
         static int GetComCtl32Version()

-            { PyErr_SetNone(PyExc_NotImplementedError); return 0; }
+            { wxPyRaiseNotImplemented(); return 0; }

     }
 #endif
 };
     }
 #endif
 };


@@ -312,7 +314,7 @@ DocStr(wxApp_CleanUp,
 
 
 DocStr(wxGetApp,
 
 
 DocStr(wxGetApp,

-       "Return a reference to the current wxApp object.");
+       "Return a reference to the current wx.App object.");

 %inline %{
     wxPyApp* wxGetApp() {
         return (wxPyApp*)wxTheApp;
 %inline %{
     wxPyApp* wxGetApp() {
         return (wxPyApp*)wxTheApp;