Conflict correction

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49951 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2007-11-14 14:51:00 +00:00
parent 3e4b352f6b
commit 6aff27c9f1

View 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;