use wxString, not wxChar*, in wxDataFormat ctor and SetId() method

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

diff --git a/include/wx/cocoa/dataform.h b/include/wx/cocoa/dataform.h
index 17b95ee4a85c3b682085d9e318a405fe9f937a83..285a13913e814006afc6a2d9399c9825763c347e 100644 (file)
--- a/include/wx/cocoa/dataform.h
+++ b/include/wx/cocoa/dataform.h
@@ -16,7 +16,7 @@ class wxDataFormat
 {
 public:
     wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }
 {
 public:
     wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }

-    wxDataFormat(const wxChar* zFormat) { SetId(zFormat); }
+    wxDataFormat(const wxString& zFormat) { SetId(zFormat); }

 
     wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
     wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }
 
     wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
     wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }


@@ -42,7 +42,7 @@ public:
     // application-specific formats
     //
     wxString GetId(void) const;
     // application-specific formats
     //
     wxString GetId(void) const;

-    void     SetId(const wxChar* WXUNUSED(pId)) { /* TODO */ }
+    void     SetId(const wxString& WXUNUSED(pId)) { /* TODO */ }

 
 private:
     unsigned int                    m_uFormat;
 
 private:
     unsigned int                    m_uFormat;

diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index 2201cd195abeab2d1afd2e7b9a1184517f3d4177..b860e208eccc8c593054383ee3e4e01dc2c4cc47 100644 (file)
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -55,7 +55,7 @@ public:
     typedef <integral type> NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID);
     typedef <integral type> NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID);

-    wxDataFormat(const wxChar *format);
+    wxDataFormat(const wxString& format);

 
     wxDataFormat& operator=(NativeFormat format);
     wxDataFormat& operator=(const wxDataFormat& format);
 
     wxDataFormat& operator=(NativeFormat format);
     wxDataFormat& operator=(const wxDataFormat& format);


@@ -67,7 +67,7 @@ public:
     NativeFormat GetType() const;
 
     wxString GetId() const;
     NativeFormat GetType() const;
 
     wxString GetId() const;

-    void SetId(const wxChar *format);
+    void SetId(const wxString& format);

 };
 
 */
 };
 
 */

diff --git a/include/wx/gtk/dataform.h b/include/wx/gtk/dataform.h
index 3b66e3117a399ce538a0408a7e12023e1a7af83d..78803ff7da1292fe950946b1ad1a0fd005b76f86 100644 (file)
--- a/include/wx/gtk/dataform.h
+++ b/include/wx/gtk/dataform.h
@@ -21,7 +21,6 @@ public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );

-    wxDataFormat( const wxChar *id );

     wxDataFormat( NativeFormat format );
 
     wxDataFormat& operator=(const wxDataFormat& format)
     wxDataFormat( NativeFormat format );
 
     wxDataFormat& operator=(const wxDataFormat& format)


@@ -50,7 +49,7 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;

-    void SetId( const wxChar *id );
+    void SetId( const wxString& id );

 
     // implementation
     wxDataFormatId GetType() const;
 
     // implementation
     wxDataFormatId GetType() const;

diff --git a/include/wx/gtk1/dataform.h b/include/wx/gtk1/dataform.h
index 5cb61dce26dd7847aae2f7177b26c5f06b03c575..5d143ed9aaab9a8c36a4b1190dc00b3f52e56fd8 100644 (file)
--- a/include/wx/gtk1/dataform.h
+++ b/include/wx/gtk1/dataform.h
@@ -21,7 +21,6 @@ public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );

-    wxDataFormat( const wxChar *id );

     wxDataFormat( NativeFormat format );
 
     wxDataFormat& operator=(const wxDataFormat& format)
     wxDataFormat( NativeFormat format );
 
     wxDataFormat& operator=(const wxDataFormat& format)


@@ -50,7 +49,7 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;

-    void SetId( const wxChar *id );
+    void SetId( const wxString& id );

 
     // implementation
     wxDataFormatId GetType() const;
 
     // implementation
     wxDataFormatId GetType() const;

diff --git a/include/wx/mac/carbon/dataform.h b/include/wx/mac/carbon/dataform.h
index ffc4f87a42e0f409287e8cd5f1663863d22b9998..7fa7cb6e0c9b5e4d710ad97151ebd27a16f65c22 100644 (file)
--- a/include/wx/mac/carbon/dataform.h
+++ b/include/wx/mac/carbon/dataform.h
@@ -20,7 +20,6 @@ public:
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);
     wxDataFormat(const wxString& rId);
     wxDataFormat();
     wxDataFormat(wxDataFormatId vType);
     wxDataFormat(const wxString& rId);

-    wxDataFormat(const wxChar* pId);

     wxDataFormat(NativeFormat vFormat);
 
     wxDataFormat& operator=(NativeFormat vFormat)
     wxDataFormat(NativeFormat vFormat);
 
     wxDataFormat& operator=(NativeFormat vFormat)


@@ -46,7 +45,7 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;

-    void SetId(const wxChar* pId);
+    void SetId(const wxString& pId);

 
     // implementation
     wxDataFormatId GetType() const { return m_type; }
 
     // implementation
     wxDataFormatId GetType() const { return m_type; }

diff --git a/include/wx/motif/dataform.h b/include/wx/motif/dataform.h
index 2487376ab3e646abc39da39dfca80986d8738873..314eaf5b6852f4fd8bdd9fa9aef724c10dc0840a 100644 (file)
--- a/include/wx/motif/dataform.h
+++ b/include/wx/motif/dataform.h
@@ -21,7 +21,6 @@ public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );

-    wxDataFormat( const wxChar *id );

     wxDataFormat( NativeFormat format );
 
     wxDataFormat& operator=(NativeFormat format)
     wxDataFormat( NativeFormat format );
 
     wxDataFormat& operator=(NativeFormat format)


@@ -48,7 +47,7 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;

-    void SetId( const wxChar *id );
+    void SetId( const wxString& id );

 
     // implementation
     wxDataFormatId GetType() const;
 
     // implementation
     wxDataFormatId GetType() const;

diff --git a/include/wx/msw/ole/dataform.h b/include/wx/msw/ole/dataform.h
index 10c6bb2c3d96a11877a40bb69dd76e0dd5d23082..3b81aef322ed01e71b7a94f645a0981c464c3d4f 100644 (file)
--- a/include/wx/msw/ole/dataform.h
+++ b/include/wx/msw/ole/dataform.h
@@ -23,7 +23,7 @@ public:
     typedef unsigned short NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID) { m_format = format; }
     typedef unsigned short NativeFormat;
 
     wxDataFormat(NativeFormat format = wxDF_INVALID) { m_format = format; }

-    wxDataFormat(const wxChar *format) { SetId(format); }
+    wxDataFormat(const wxString& format) { SetId(format); }

 
     wxDataFormat& operator=(NativeFormat format)
         { m_format = format; return *this; }
 
     wxDataFormat& operator=(NativeFormat format)
         { m_format = format; return *this; }


@@ -55,7 +55,7 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;

-    void SetId(const wxChar *format);
+    void SetId(const wxString& format);

 
     // returns true if the format is one of those defined in wxDataFormatId
     bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; }
 
     // returns true if the format is one of those defined in wxDataFormatId
     bool IsStandard() const { return m_format > 0 && m_format < wxDF_PRIVATE; }

diff --git a/include/wx/os2/dataform.h b/include/wx/os2/dataform.h
index 18336bb54096845ea8b93945b0e89af56993f892..b28d0594037cb8e0b72af66db4edb81a207aa476 100644 (file)
--- a/include/wx/os2/dataform.h
+++ b/include/wx/os2/dataform.h
@@ -16,7 +16,7 @@ class wxDataFormat
 {
 public:
     wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }
 {
 public:
     wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }

-    wxDataFormat(const wxChar* zFormat) { SetId(zFormat); }
+    wxDataFormat(const wxString& zFormat) { SetId(zFormat); }

 
     wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
     wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }
 
     wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
     wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }


@@ -42,7 +42,7 @@ public:
     // application-specific formats
     //
     wxString GetId(void) const;
     // application-specific formats
     //
     wxString GetId(void) const;

-    void     SetId(const wxChar* pId);
+    void     SetId(const wxString& pId);

 
 private:
     unsigned int                    m_uFormat;
 
 private:
     unsigned int                    m_uFormat;

diff --git a/include/wx/x11/dataform.h b/include/wx/x11/dataform.h
index 0e6fed774ffd9efeac6135c9e397ab87f2476748..56a956093f6c6f64665d9ba10a7a44f0c09fce16 100644 (file)
--- a/include/wx/x11/dataform.h
+++ b/include/wx/x11/dataform.h
@@ -21,7 +21,6 @@ public:
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );
     wxDataFormat();
     wxDataFormat( wxDataFormatId type );
     wxDataFormat( const wxString &id );

-    wxDataFormat( const wxChar *id );

     wxDataFormat( NativeFormat format );
     
     wxDataFormat& operator=(NativeFormat format)
     wxDataFormat( NativeFormat format );
     
     wxDataFormat& operator=(NativeFormat format)


@@ -48,7 +47,7 @@ public:
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;
     // string ids are used for custom types - this SetId() must be used for
     // application-specific formats
     wxString GetId() const;

-    void SetId( const wxChar *id );
+    void SetId( const wxString& id );

     
     // implementation
     wxDataFormatId GetType() const;
     
     // implementation
     wxDataFormatId GetType() const;

diff --git a/src/gtk/dataobj.cpp b/src/gtk/dataobj.cpp
index ce2ec4730b91e7c7fccfb43c043a30fc03c60637..4c3e4225eb3a7b31136cad9be840092662933794 100644 (file)
--- a/src/gtk/dataobj.cpp
+++ b/src/gtk/dataobj.cpp
@@ -58,12 +58,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-

 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();


@@ -138,12 +132,11 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )

 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;

-    wxString tmp( id );
-    m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE );
+    m_format = gdk_atom_intern( id.ToAscii(), FALSE );

 }
 
 void wxDataFormat::PrepareFormats()
 }
 
 void wxDataFormat::PrepareFormats()

diff --git a/src/gtk1/dataobj.cpp b/src/gtk1/dataobj.cpp
index e93e1d7047cfedcac67efbed49c2ab36f81941f0..97b7bc8510b0162431ee1fde1f0985812d0cd8d8 100644 (file)
--- a/src/gtk1/dataobj.cpp
+++ b/src/gtk1/dataobj.cpp
@@ -58,12 +58,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-

 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();


@@ -140,12 +134,11 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )

 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;

-    wxString tmp( id );
-    m_format = gdk_atom_intern( (const char*) tmp.ToAscii(), FALSE );
+    m_format = gdk_atom_intern( id.ToAscii(), FALSE );

 }
 
 void wxDataFormat::PrepareFormats()
 }
 
 void wxDataFormat::PrepareFormats()

diff --git a/src/mac/carbon/dataobj.cpp b/src/mac/carbon/dataobj.cpp
index fb73241ed9b61dcc8d2c81742c579ac3e49fadcc..748c387ad6bd47d4ff94563cb7372b37959bbf2d 100644 (file)
--- a/src/mac/carbon/dataobj.cpp
+++ b/src/mac/carbon/dataobj.cpp
@@ -49,11 +49,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId vType )
     SetType( vType );
 }
 
     SetType( vType );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *zId )
-{
-    SetId( zId );
-}
-

 wxDataFormat::wxDataFormat( const wxString& rId )
 {
     SetId( rId );
 wxDataFormat::wxDataFormat( const wxString& rId )
 {
     SetId( rId );


@@ -137,7 +132,7 @@ void wxDataFormat::SetId( NativeFormat format )
     }
 }
 
     }
 }
 

-void wxDataFormat::SetId( const wxChar* zId )
+void wxDataFormat::SetId( const wxString& zId )

 {
     m_type = wxDF_PRIVATE;
     m_id = zId;
 {
     m_type = wxDF_PRIVATE;
     m_id = zId;

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index 7b4f82f041074cf9124152ce13a087ca248b3903..c96ec26e1541eaf55772e7622a0496cf5fcf3a82 100644 (file)
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -61,12 +61,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-

 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();


@@ -129,13 +123,12 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )

 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;
 {
     PrepareFormats();
     m_type = wxDF_PRIVATE;

-    wxString tmp( id );

     m_format = XInternAtom( wxGlobalDisplay(),
     m_format = XInternAtom( wxGlobalDisplay(),

-                            tmp.mbc_str(), False );
+                            id.mbc_str(), False );

 }
 
 void wxDataFormat::PrepareFormats()
 }
 
 void wxDataFormat::PrepareFormats()

diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp
index 48e999239ac263727661a26fec9d9be1a4c6cd36..6452e4b2fd4d9964d212b14da2306aded0f501ea 100644 (file)
--- a/src/msw/ole/dataobj.cpp
+++ b/src/msw/ole/dataobj.cpp
@@ -137,7 +137,7 @@ private:
 // wxDataFormat
 // ----------------------------------------------------------------------------
 
 // wxDataFormat
 // ----------------------------------------------------------------------------
 

-void wxDataFormat::SetId(const wxChar *format)
+void wxDataFormat::SetId(const wxString& format)

 {
     m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format);
     if ( !m_format )
 {
     m_format = (wxDataFormat::NativeFormat)::RegisterClipboardFormat(format);
     if ( !m_format )

diff --git a/src/os2/dataobj.cpp b/src/os2/dataobj.cpp
index 8ec854054c90e88e986a306b514655c61af2ba70..81939cf4295c9588cd961e24333e0d2408c258b2 100644 (file)
--- a/src/os2/dataobj.cpp
+++ b/src/os2/dataobj.cpp
@@ -57,11 +57,11 @@ wxString wxDataFormat::GetId() const
 } // end of wxDataFormat::GetId()
 
 void wxDataFormat::SetId (
 } // end of wxDataFormat::GetId()
 
 void wxDataFormat::SetId (

-  const wxChar*                     zId
+  const wxString&                     zId

 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()
 )
 {
     m_uFormat = ::WinAddAtom( ::WinQuerySystemAtomTable()

-                             ,(PSZ)zId
+                             ,zId.char_str()

                             );
 } // end of wxDataFormat::SetId
 
                             );
 } // end of wxDataFormat::SetId
 

diff --git a/src/x11/dataobj.cpp b/src/x11/dataobj.cpp
index b0c6bbc7d4d658c6df6e71a6062f053cef5ac991..b9b8f7a37d259fa8dd4e89d287287749d1cda3d9 100644 (file)
--- a/src/x11/dataobj.cpp
+++ b/src/x11/dataobj.cpp
@@ -57,12 +57,6 @@ wxDataFormat::wxDataFormat( wxDataFormatId type )
     SetType( type );
 }
 
     SetType( type );
 }
 

-wxDataFormat::wxDataFormat( const wxChar *id )
-{
-    PrepareFormats();
-    SetId( id );
-}
-

 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();
 wxDataFormat::wxDataFormat( const wxString &id )
 {
     PrepareFormats();


@@ -129,13 +123,12 @@ void wxDataFormat::SetId( NativeFormat format )
         m_type = wxDF_PRIVATE;
 }
 
         m_type = wxDF_PRIVATE;
 }
 

-void wxDataFormat::SetId( const wxChar *id )
+void wxDataFormat::SetId( const wxString& id )

 {
 #if !wxUSE_NANOX
     PrepareFormats();
     m_type = wxDF_PRIVATE;
 {
 #if !wxUSE_NANOX
     PrepareFormats();
     m_type = wxDF_PRIVATE;

-    wxString tmp( id );
-    m_format = XInternAtom( (Display*) wxGetDisplay(), tmp.ToAscii(), FALSE );
+    m_format = XInternAtom( (Display*) wxGetDisplay(), id.ToAscii(), FALSE );

 #endif
 }
 
 #endif
 }