*** empty log message ***

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4127 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/os2/dataform.h b/include/wx/os2/dataform.h
index 2ba539b674a4d97c00c3b3dc1ea6a74355470151..23b4b51ee6c59b7f61732f6269415f269466eb5a 100644 (file)
--- a/include/wx/os2/dataform.h
+++ b/include/wx/os2/dataform.h
@@ -50,8 +50,8 @@ public:
     wxDataFormatId GetType() const;
 
 private:
     wxDataFormatId GetType() const;
 
 private:

-    wxDataFormatId   m_type;
-    NativeFormat     m_format;
+    wxDataFormatId                  m_vType;
+    NativeFormat                    m_vFormat;

 
     void PrepareFormats();
     void SetType( wxDataFormatId type );
 
     void PrepareFormats();
     void SetType( wxDataFormatId type );

diff --git a/include/wx/os2/dnd.h b/include/wx/os2/dnd.h
index d77403922151d9d828318f664396f43a652290e3..60efc76fe884f628d8e6bd4f0fb742c69464ab40 100644 (file)
--- a/include/wx/os2/dnd.h
+++ b/include/wx/os2/dnd.h
@@ -29,16 +29,11 @@ class WXDLLEXPORT wxDropSource: public wxDropSourceBase
 {
 public:
     /* constructor. set data later with SetData() */
 {
 public:
     /* constructor. set data later with SetData() */

-    wxDropSource( wxWindow*     pWin
-                 ,const wxIcon& rGo = wxNullIcon
-                 ,const wxIcon& rStop = wxNullIcon
-                );
+    wxDropSource(wxWindow* pWin);

 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& rData,
                   wxWindow*     pWin,
 
     /* constructor for setting one data object */
     wxDropSource( wxDataObject& rData,
                   wxWindow*     pWin,

-                  const wxIcon& rGo = wxNullIcon,
-                  const wxIcon& rStop = wxNullIcon

                 );
     virtual ~wxDropSource();
 
                 );
     virtual ~wxDropSource();