GetValue is pure virtual

[wxWidgets.git] / wxPython / src / gtk / wx.py

diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py
index 159bf91e0e5b1d4c774cdb150f2d2c3728017075..76811ff9d70d035da3a81c60553daa7f5caf0027 100644 (file)
--- a/wxPython/src/gtk/wx.py
+++ b/wxPython/src/gtk/wx.py
@@ -46,9 +46,15 @@ class wxPyAppPtr(wxEvtHandlerPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,wxc=wxc):
-        if self.thisown == 1 :
-            wxc.delete_wxPyApp(self)
+    def __del__(self, delfunc=wxc.delete_wxPyApp):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
+    def _setCallbackInfo(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp__setCallbackInfo,(self,) + _args, _kwargs)
+        return val

     def GetAppName(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_GetAppName,(self,) + _args, _kwargs)
         return val
     def GetAppName(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_GetAppName,(self,) + _args, _kwargs)
         return val


@@ -88,6 +94,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
     def ProcessIdle(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_ProcessIdle,(self,) + _args, _kwargs)
         return val
     def ProcessIdle(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_ProcessIdle,(self,) + _args, _kwargs)
         return val

+    def Yield(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_Yield,(self,) + _args, _kwargs)
+        return val

     def SetAppName(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_SetAppName,(self,) + _args, _kwargs)
         return val
     def SetAppName(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_SetAppName,(self,) + _args, _kwargs)
         return val


@@ -109,12 +118,20 @@ class wxPyAppPtr(wxEvtHandlerPtr):
     def SetUseBestVisual(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_SetUseBestVisual,(self,) + _args, _kwargs)
         return val
     def SetUseBestVisual(self, *_args, **_kwargs):
         val = apply(wxc.wxPyApp_SetUseBestVisual,(self,) + _args, _kwargs)
         return val

+    def GetAssertMode(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_GetAssertMode,(self,) + _args, _kwargs)
+        return val
+    def SetAssertMode(self, *_args, **_kwargs):
+        val = apply(wxc.wxPyApp_SetAssertMode,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxPyApp instance at %s>" % (self.this,)
 class wxPyApp(wxPyAppPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(wxc.new_wxPyApp,_args,_kwargs)
         self.thisown = 1
     def __repr__(self):
         return "<C wxPyApp instance at %s>" % (self.this,)
 class wxPyApp(wxPyAppPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(wxc.new_wxPyApp,_args,_kwargs)
         self.thisown = 1

+        self._setCallbackInfo(self, wxPyApp)
+        self._setOORInfo(self)

 
 
 
 
 
 


@@ -143,11 +160,34 @@ _wxSetDictionary = wxc._wxSetDictionary
 
 def wxGetApp(*_args, **_kwargs):
     val = apply(wxc.wxGetApp,_args,_kwargs)
 
 def wxGetApp(*_args, **_kwargs):
     val = apply(wxc.wxGetApp,_args,_kwargs)

-    if val: val = wxPyAppPtr(val)

     return val
 
 wxApp_CleanUp = wxc.wxApp_CleanUp
 
     return val
 
 wxApp_CleanUp = wxc.wxApp_CleanUp
 

+wxPyApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
+
+wxPyApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
+
+wxPyApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
+
+wxPyApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId
+
+wxPyApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
+
+wxPyApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
+
+wxPyApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
+
+wxPyApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
+
+wxPyApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
+
+wxPyApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId
+
+wxPyApp_SetMacExitMenuItemId = wxc.wxPyApp_SetMacExitMenuItemId
+
+wxPyApp_SetMacHelpMenuTitleName = wxc.wxPyApp_SetMacHelpMenuTitleName
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 #-------------- VARIABLE WRAPPERS ------------------


@@ -255,6 +295,10 @@ wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL
 wxTE_DONTWRAP = wxc.wxTE_DONTWRAP
 wxTE_LINEWRAP = wxc.wxTE_LINEWRAP
 wxTE_WORDWRAP = wxc.wxTE_WORDWRAP
 wxTE_DONTWRAP = wxc.wxTE_DONTWRAP
 wxTE_LINEWRAP = wxc.wxTE_LINEWRAP
 wxTE_WORDWRAP = wxc.wxTE_WORDWRAP

+wxTE_LEFT = wxc.wxTE_LEFT
+wxTE_RIGHT = wxc.wxTE_RIGHT
+wxTE_CENTER = wxc.wxTE_CENTER
+wxTE_CENTRE = wxc.wxTE_CENTRE

 wxCB_SIMPLE = wxc.wxCB_SIMPLE
 wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
 wxCB_SORT = wxc.wxCB_SORT
 wxCB_SIMPLE = wxc.wxCB_SIMPLE
 wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
 wxCB_SORT = wxc.wxCB_SORT


@@ -264,6 +308,7 @@ wxRA_VERTICAL = wxc.wxRA_VERTICAL
 wxRA_SPECIFY_ROWS = wxc.wxRA_SPECIFY_ROWS
 wxRA_SPECIFY_COLS = wxc.wxRA_SPECIFY_COLS
 wxRB_GROUP = wxc.wxRB_GROUP
 wxRA_SPECIFY_ROWS = wxc.wxRA_SPECIFY_ROWS
 wxRA_SPECIFY_COLS = wxc.wxRA_SPECIFY_COLS
 wxRB_GROUP = wxc.wxRB_GROUP

+wxRB_SINGLE = wxc.wxRB_SINGLE

 wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR
 wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL
 wxGA_VERTICAL = wxc.wxGA_VERTICAL
 wxGA_PROGRESSBAR = wxc.wxGA_PROGRESSBAR
 wxGA_HORIZONTAL = wxc.wxGA_HORIZONTAL
 wxGA_VERTICAL = wxc.wxGA_VERTICAL


@@ -785,10 +830,6 @@ wxHT_WINDOW_VERT_SCROLLBAR = wxc.wxHT_WINDOW_VERT_SCROLLBAR
 wxHT_WINDOW_HORZ_SCROLLBAR = wxc.wxHT_WINDOW_HORZ_SCROLLBAR
 wxHT_WINDOW_CORNER = wxc.wxHT_WINDOW_CORNER
 wxHT_MAX = wxc.wxHT_MAX
 wxHT_WINDOW_HORZ_SCROLLBAR = wxc.wxHT_WINDOW_HORZ_SCROLLBAR
 wxHT_WINDOW_CORNER = wxc.wxHT_WINDOW_CORNER
 wxHT_MAX = wxc.wxHT_MAX

-FALSE = wxc.FALSE
-false = wxc.false
-TRUE = wxc.TRUE
-true = wxc.true

 wxEVT_NULL = wxc.wxEVT_NULL
 wxEVT_FIRST = wxc.wxEVT_FIRST
 wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED
 wxEVT_NULL = wxc.wxEVT_NULL
 wxEVT_FIRST = wxc.wxEVT_FIRST
 wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED


@@ -913,13 +954,17 @@ __version__ = wxc.__version__
 cvar = wxc.cvar
 wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition)
 wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize)
 cvar = wxc.cvar
 wxDefaultPosition = wxPointPtr(wxc.cvar.wxDefaultPosition)
 wxDefaultSize = wxSizePtr(wxc.cvar.wxDefaultSize)

+wxPYAPP_ASSERT_SUPPRESS = wxc.wxPYAPP_ASSERT_SUPPRESS
+wxPYAPP_ASSERT_EXCEPTION = wxc.wxPYAPP_ASSERT_EXCEPTION
+wxPYAPP_ASSERT_DIALOG = wxc.wxPYAPP_ASSERT_DIALOG
+wxPYAPP_ASSERT_LOG = wxc.wxPYAPP_ASSERT_LOG

 
 
 #-------------- USER INCLUDE -----------------------
 
 #----------------------------------------------------------------------------
 # Name:         _extra.py
 
 
 #-------------- USER INCLUDE -----------------------
 
 #----------------------------------------------------------------------------
 # Name:         _extra.py

-# Purpose:     This file is appended to the shadow class file generated
+# Purpose:      This file is appended to the shadow class file generated

 #               by SWIG.  We add some unSWIGable things here.
 #
 # Author:       Robin Dunn
 #               by SWIG.  We add some unSWIGable things here.
 #
 # Author:       Robin Dunn


@@ -1050,6 +1095,12 @@ def EVT_WINDOW_CREATE(win, func):
 def EVT_WINDOW_DESTROY(win, func):
     win.Connect(-1, -1, wxEVT_DESTROY, func)
 
 def EVT_WINDOW_DESTROY(win, func):
     win.Connect(-1, -1, wxEVT_DESTROY, func)
 

+def EVT_WINDOW_CREATE_ID(win, id, func):
+    win.Connect(id, -1, wxEVT_CREATE, func)
+
+def EVT_WINDOW_DESTROY_ID(win, id, func):
+    win.Connect(id, -1, wxEVT_DESTROY, func)
+

 def EVT_SET_CURSOR(win, func):
     win.Connect(-1, -1, wxEVT_SET_CURSOR, func)
 
 def EVT_SET_CURSOR(win, func):
     win.Connect(-1, -1, wxEVT_SET_CURSOR, func)
 


@@ -1182,7 +1233,7 @@ def EVT_COMMAND_SCROLL(win, id, func):
     win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN,  func)
     win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func)
     win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE,func)
     win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN,  func)
     win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func)
     win.Connect(id, -1, wxEVT_SCROLL_THUMBRELEASE,func)

-    win.Connect(-1, -1, wxEVT_SCROLL_ENDSCROLL,   func)
+    win.Connect(id, -1, wxEVT_SCROLL_ENDSCROLL,   func)

 
 def EVT_COMMAND_SCROLL_TOP(win, id, func):
     win.Connect(id, -1, wxEVT_SCROLL_TOP, func)
 
 def EVT_COMMAND_SCROLL_TOP(win, id, func):
     win.Connect(id, -1, wxEVT_SCROLL_TOP, func)


@@ -1506,17 +1557,50 @@ wxColor      = wxColour
 wxNamedColor = wxNamedColour
 wxPen        = wxPyPen
 wxScrollbar  = wxScrollBar
 wxNamedColor = wxNamedColour
 wxPen        = wxPyPen
 wxScrollbar  = wxScrollBar

+wxPoint2D    = wxPoint2DDouble
+
+wxPyAssertionError = wxc.wxPyAssertionError

 
 
 # backwards compatibility
 
 
 # backwards compatibility

-wxNoRefBitmap       = wxBitmap
-wxPyDefaultPosition = wxDefaultPosition
-wxPyDefaultSize     = wxDefaultSize
-NULL                = None
+wxNoRefBitmap           = wxBitmap
+wxPyDefaultPosition     = wxDefaultPosition
+wxPyDefaultSize         = wxDefaultSize
+NULL                    = None

 wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour
 wxSystemSettings_GetSystemFont   = wxSystemSettings_GetFont
 wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
 
 wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour
 wxSystemSettings_GetSystemFont   = wxSystemSettings_GetFont
 wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
 

+
+# workarounds for bad wxRTTI names
+__wxPyPtrTypeMap['wxGauge95']    = 'wxGauge'
+
+
+
+def NewId():
+    import warnings
+    warnings.warn("Use wxNewId instead", DeprecationWarning, 2)
+    return wxNewId()
+
+def RegisterId(ID):
+    import warnings
+    warnings.warn("Use wxRegisterId instead", DeprecationWarning, 2)
+    return wxRegisterId(ID)
+
+
+
+# Use Python's bool constants if available, make aliases if not
+try:
+    True
+except NameError:
+    True = 1==1
+    False = 1==0
+
+# Backwards compaatible
+TRUE  = true  = True
+FALSE = false = False
+
+

 #----------------------------------------------------------------------
 # wxGTK sets the locale when initialized.  Doing this at the Python
 # level should set it up to match what GTK is doing at the C level.
 #----------------------------------------------------------------------
 # wxGTK sets the locale when initialized.  Doing this at the Python
 # level should set it up to match what GTK is doing at the C level.


@@ -1527,7 +1611,11 @@ if wxPlatform == "__WXGTK__":
     except:
         pass
 
     except:
         pass
 

-
+if wxPlatform == "__WXMSW__":
+    import os
+    localedir = os.path.join(os.path.split(__file__)[0], "locale")
+    wxLocale_AddCatalogLookupPathPrefix(localedir)
+    del os

 
 #----------------------------------------------------------------------
 # wxWindows version numbers.  wxPython version is in __version__.
 
 #----------------------------------------------------------------------
 # wxWindows version numbers.  wxPython version is in __version__.


@@ -1579,6 +1667,18 @@ def wxPyTypeCast(obj, typeStr):
         theObj.thisown = obj.thisown
     return theObj
 
         theObj.thisown = obj.thisown
     return theObj
 

+#----------------------------------------------------------------------------
+# An isinstance for Pythons < 2.2 that can check a sequence of class objects
+# like the one in 2.2 can.
+
+def wxPy_isinstance(obj, klasses):
+    import types
+    if sys.version[:3] < "2.2" and type(klasses) in [types.TupleType, types.ListType]:
+        for klass in klasses:
+            if isinstance(obj, klass): return True
+        return False
+    else:
+        return isinstance(obj, klasses)

 
 #----------------------------------------------------------------------------
 _wxCallAfterId = None
 
 #----------------------------------------------------------------------------
 _wxCallAfterId = None


@@ -1604,6 +1704,9 @@ def wxCallAfter(callable, *args, **kw):
     evt.kw = kw
     wxPostEvent(app, evt)
 
     evt.kw = kw
     wxPostEvent(app, evt)
 

+# an alias
+wxRunLater = wxCallAfter
+

 #----------------------------------------------------------------------
 
 class wxPyDeadObjectError(AttributeError):
 #----------------------------------------------------------------------
 
 class wxPyDeadObjectError(AttributeError):


@@ -1663,7 +1766,7 @@ class wxPyOnDemandOutputWindow:
             self.text  = wxTextCtrl(self.frame, -1, "",
                                     style = wxTE_MULTILINE|wxTE_READONLY)
             self.frame.SetSize(wxSize(450, 300))
             self.text  = wxTextCtrl(self.frame, -1, "",
                                     style = wxTE_MULTILINE|wxTE_READONLY)
             self.frame.SetSize(wxSize(450, 300))

-            self.frame.Show(true)
+            self.frame.Show(True)

             EVT_CLOSE(self.frame, self.OnCloseWindow)
         self.text.AppendText(str)
 
             EVT_CLOSE(self.frame, self.OnCloseWindow)
         self.text.AppendText(str)
 


@@ -1684,12 +1787,17 @@ class wxApp(wxPyApp):
     error = 'wxApp.error'
     outputWindowClass = wxPyOnDemandOutputWindow
 
     error = 'wxApp.error'
     outputWindowClass = wxPyOnDemandOutputWindow
 

-    def __init__(self, redirect=_defRedirect, filename=None):
+    def __init__(self, redirect=_defRedirect, filename=None, useBestVisual=False):

         wxPyApp.__init__(self)
         self.stdioWin = None
         self.saveStdio = (sys.stdout, sys.stderr)
         wxPyApp.__init__(self)
         self.stdioWin = None
         self.saveStdio = (sys.stdout, sys.stderr)

+
+        # This has to be done before OnInit
+        self.SetUseBestVisual(useBestVisual)
+

         if redirect:
             self.RedirectStdio(filename)
         if redirect:
             self.RedirectStdio(filename)

+

         # this initializes wxWindows and then calls our OnInit
         _wxStart(self.OnInit)
 
         # this initializes wxWindows and then calls our OnInit
         _wxStart(self.OnInit)
 


@@ -1716,7 +1824,7 @@ class wxApp(wxPyApp):
         if filename:
             sys.stdout = sys.stderr = open(filename, 'a')
         else:
         if filename:
             sys.stdout = sys.stderr = open(filename, 'a')
         else:

-            self.stdioWin = self.outputWindowClass() # wxPyOnDemandOutputWindow
+            self.stdioWin = self.outputWindowClass()

             sys.stdout = sys.stderr = self.stdioWin
 
 
             sys.stdout = sys.stderr = self.stdioWin
 
 


@@ -1724,6 +1832,21 @@ class wxApp(wxPyApp):
         sys.stdout, sys.stderr = self.saveStdio
 
 
         sys.stdout, sys.stderr = self.saveStdio
 
 

+# change from wxPyApp_ to wxApp_
+wxApp_GetMacDefaultEncodingIsPC = wxc.wxPyApp_GetMacDefaultEncodingIsPC
+wxApp_GetMacSupportPCMenuShortcuts = wxc.wxPyApp_GetMacSupportPCMenuShortcuts
+wxApp_GetMacAboutMenuItemId = wxc.wxPyApp_GetMacAboutMenuItemId
+wxApp_GetMacPreferencesMenuItemId = wxc.wxPyApp_GetMacPreferencesMenuItemId
+wxApp_GetMacExitMenuItemId = wxc.wxPyApp_GetMacExitMenuItemId
+wxApp_GetMacHelpMenuTitleName = wxc.wxPyApp_GetMacHelpMenuTitleName
+wxApp_SetMacDefaultEncodingIsPC = wxc.wxPyApp_SetMacDefaultEncodingIsPC
+wxApp_SetMacSupportPCMenuShortcuts = wxc.wxPyApp_SetMacSupportPCMenuShortcuts
+wxApp_SetMacAboutMenuItemId = wxc.wxPyApp_SetMacAboutMenuItemId
+wxApp_SetMacPreferencesMenuItemId = wxc.wxPyApp_SetMacPreferencesMenuItemId
+wxApp_SetMacExitMenuItemId = wxc.wxPyApp_SetMacExitMenuItemId
+wxApp_SetMacHelpMenuTitleName = wxc.wxPyApp_SetMacHelpMenuTitleName
+
+

 #----------------------------------------------------------------------------
 
 class wxPySimpleApp(wxApp):
 #----------------------------------------------------------------------------
 
 class wxPySimpleApp(wxApp):


@@ -1731,7 +1854,7 @@ class wxPySimpleApp(wxApp):
         wxApp.__init__(self, flag)
     def OnInit(self):
         wxInitAllImageHandlers()
         wxApp.__init__(self, flag)
     def OnInit(self):
         wxInitAllImageHandlers()

-        return true
+        return True

 
 
 class wxPyWidgetTester(wxApp):
 
 
 class wxPyWidgetTester(wxApp):


@@ -1742,11 +1865,11 @@ class wxPyWidgetTester(wxApp):
     def OnInit(self):
         self.frame = wxFrame(None, -1, "Widget Tester", pos=(0,0), size=self.size)
         self.SetTopWindow(self.frame)
     def OnInit(self):
         self.frame = wxFrame(None, -1, "Widget Tester", pos=(0,0), size=self.size)
         self.SetTopWindow(self.frame)

-        return true
+        return True

 
     def SetWidget(self, widgetClass, *args):
         w = apply(widgetClass, (self.frame,) + args)
 
     def SetWidget(self, widgetClass, *args):
         w = apply(widgetClass, (self.frame,) + args)

-        self.frame.Show(true)
+        self.frame.Show(True)

 
 #----------------------------------------------------------------------------
 # DO NOT hold any other references to this object.  This is how we
 
 #----------------------------------------------------------------------------
 # DO NOT hold any other references to this object.  This is how we