Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolving conflicts in files I had forgot to commit (sorry)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25669 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-02-08 22:04:51 +00:00
parent 5a30d45018
commit a6c811617b
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/msw/pen.cpp
View File

@@ -31,7 +31,7 @@
#include "wx/msw/private.h"
int wx2msPenStyle(int wx_style);
static int wx2msPenStyle(int wx_style);
IMPLEMENT_DYNAMIC_CLASS(wxPen, wxGDIObject)