Merge in from trunk r68684 - r69046

[wxWidgets.git] / misc / gdb / print.py

diff --git a/misc/gdb/print.py b/misc/gdb/print.py
index 46a71d0056f313de4e997131939a89535880b86a..703c9c6a6825efc3a91e6ad8c249d352ce8cfd72 100755 (executable)
--- a/misc/gdb/print.py
+++ b/misc/gdb/print.py
@@ -5,17 +5,62 @@
 #               in the future...)
 # Author:       Vadim Zeitlin
 # Created:      2009-01-04
-# RCS-Id:       $Id:$
+# RCS-Id:       $Id$
 # Copyright:    (c) 2009 Vadim Zeitlin
-# License:      wxWindows licence
+# Licence:      wxWindows licence
 ###############################################################################
 
+# Define wxFooPrinter class implementing (at least) to_string() method for each
+# wxFoo class we want to pretty print. Then just add wxFoo to the types array
+# in wxLookupFunction at the bottom of this file.
+
+
 # shamelessly stolen from std::string example
 class wxStringPrinter:
     def __init__(self, val):
         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'].string()
+
+    def display_hint(self):
+        return 'string'
+
+class wxXYPrinterBase:
+    def __init__(self, val):
+        self.x = val['x']
+        self.y = val['y']
+
+class wxPointPrinter(wxXYPrinterBase):
+    def to_string(self):
+        return '(%d, %d)' % (self.x, self.y)
+
+class wxSizePrinter(wxXYPrinterBase):
+    def to_string(self):
+        return '%d*%d' % (self.x, self.y)
+
+class wxRectPrinter(wxXYPrinterBase):
+    def __init__(self, val):
+        wxXYPrinterBase.__init__(self, val)
+        self.width = val['width']
+        self.height = val['height']
+
+    def to_string(self):
+        return '(%d, %d) %d*%d' % (self.x, self.y, self.width, self.height)
+
+
+# The function looking up the pretty-printer to use for the given value.
+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', 'wxPoint', 'wxSize', 'wxRect']
+
+    for t in types:
+        if val.type.tag == t:
+            # Not sure if this is the best name to create the object of a class
+            # by name but at least it beats eval()
+            return globals()[t + 'Printer'](val)
+
+    return None
 
-gdb.pretty_printers['^wxString$'] = wxStringPrinter
+gdb.pretty_printers.append(wxLookupFunction)