]> git.saurik.com Git - wxWidgets.git/commitdiff
Conflict correction
authorJulian Smart <julian@anthemion.co.uk>
Wed, 14 Nov 2007 14:51:00 +0000 (14:51 +0000)
committerJulian Smart <julian@anthemion.co.uk>
Wed, 14 Nov 2007 14:51:00 +0000 (14:51 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/msw/radiobut.h

index 0fc9ad66a6b29fea0abb47dc131b820f1b7dcc03..e5959d494b7579e40b2862fe7d4450537f6d8d1c 100644 (file)
@@ -49,7 +49,6 @@ public:
     virtual bool MSWCommand(WXUINT param, WXWORD id);
     virtual void Command(wxCommandEvent& event);
     virtual bool HasTransparentBackground() { return true; }
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
 
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;