X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f38667487c308a68ee67d25aee9275ab70aaf0..7b7c2bb40c88137420900f6648fd42a6ab1b85c6:/misc/gdb/print.py?ds=sidebyside

diff --git a/misc/gdb/print.py b/misc/gdb/print.py
index 8e19a57a24..40084758e3 100755
--- a/misc/gdb/print.py
+++ b/misc/gdb/print.py
@@ -22,7 +22,7 @@ class wxStringPrinter:
         self.val = val
 
     def to_string(self):
-        return self.val['m_impl']['_M_dataplus']['_M_p'].string()
+        return self.val['m_impl']['_M_dataplus']['_M_p']
 
     def display_hint(self):
         return 'string'
@@ -36,9 +36,24 @@ class wxDateTimePrinter:
         # expressions directly so we need to convert it to long long first and
         # then cast to int explicitly to be able to use it as a timestamp.
         msec = self.val['m_time'].cast(gdb.lookup_type('long long'))
+        if msec == 0x8000000000000000:
+            return 'NONE'
         sec = int(msec / 1000)
         return datetime.datetime.fromtimestamp(sec).isoformat(' ')
 
+class wxFileNamePrinter:
+    def __init__(self, val):
+        self.val = val
+
+    def to_string(self):
+        # It is simpler to just call the internal function here than to iterate
+        # over m_dirs array ourselves. The disadvantage of this approach is
+        # that it requires a live inferior process and so doesn't work when
+        # debugging using only a core file. If this ever becomes a serious
+        # problem, this should be rewritten to use m_dirs and m_name and m_ext.
+        return gdb.parse_and_eval('((wxFileName*)%s)->GetFullPath(0)' %
+                                  self.val.address)
+
 class wxXYPrinterBase:
     def __init__(self, val):
         self.x = val['x']
@@ -66,7 +81,12 @@ class wxRectPrinter(wxXYPrinterBase):
 def wxLookupFunction(val):
     # Using a list is probably ok for so few items but consider switching to a
     # set (or a dict and cache class types as the keys in it?) if needed later.
-    types = ['wxString', 'wxDateTime', 'wxPoint', 'wxSize', 'wxRect']
+    types = ['wxString',
+             'wxDateTime',
+             'wxFileName',
+             'wxPoint',
+             'wxSize',
+             'wxRect']
 
     for t in types:
         if val.type.tag == t: