]> git.saurik.com Git - wxWidgets.git/commitdiff
Interface fixes changing fiction into truth.
authorRobin Dunn <robin@alldunn.com>
Wed, 8 Feb 2012 00:22:21 +0000 (00:22 +0000)
committerRobin Dunn <robin@alldunn.com>
Wed, 8 Feb 2012 00:22:21 +0000 (00:22 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

interface/wx/frame.h
interface/wx/graphics.h

index fc2ac1554e0ae62b07691cfae5fc34071974b319..0124755b99e4715c35ccde5cf051b1d832729d32 100644 (file)
@@ -234,7 +234,7 @@ public:
     */
     virtual wxStatusBar* CreateStatusBar(int number = 1, long style = wxSTB_DEFAULT_STYLE,
                                          wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
+                                         const wxString& name = wxStatusBarNameStr);
 
     /**
         Creates a toolbar at the top or left of the frame.
index 83627b2ef416f9c7e6ad05ccb0dafd35880502a5..6431067da99b100a324db42ad0df0531ab6a9311 100644 (file)
@@ -807,6 +807,23 @@ public:
     virtual wxCompositionMode GetCompositionMode() const;
 
 
+    /**
+       Push the current state of the context's transformation matrix on a
+       stack.
+
+       @see wxGraphicsContext::PopState
+    */
+    virtual void PushState() = 0;
+
+    /**
+       Pops a stored state from the stack and sets the current transformation
+       matrix to that state.
+
+       @see wxGraphicsContext::PopState
+    */
+    virtual void PopState() = 0;
+
+
     virtual void EnableOffset(bool enable = true);
     void DisableOffset();
     bool OffsetEnabled();