m_clientData conflict fixed
authorVadim Zeitlin <vadim@wxwidgets.org>
Wed, 28 Jul 1999 22:53:33 +0000 (22:53 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Wed, 28 Jul 1999 22:53:33 +0000 (22:53 +0000)
commit452fd09f3662b4058d374fe38f6800da227ea59d
tree932aa7f2b701349acc63c956ccebd2ec1cec51a1
parentb1519886c3c581f92ab3cdd00fe11fbb40eab67d
m_clientData conflict fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
include/wx/generic/choicdgg.h
include/wx/gtk/choicdlg.h
include/wx/gtk1/choicdlg.h
src/gtk/choicdlg.cpp
src/gtk1/choicdlg.cpp