Remove wxRTTI macro for wxComboBox from Motif port.

[wxWidgets.git] / include / wx / archive.h

diff --git a/include/wx/archive.h b/include/wx/archive.h
index 6f0ce844e15b3ccf308786b5b9003aca98e40bc1..cd8438972dd2a01ae2b114bbc520f0a18486a6b3 100644 (file)
--- a/include/wx/archive.h
+++ b/include/wx/archive.h
@@ -225,7 +225,7 @@ public:
         if (it.m_rep)
             it.m_rep.AddRef();
         if (m_rep)
         if (it.m_rep)
             it.m_rep.AddRef();
         if (m_rep)

-            m_rep.UnRef();
+            this->m_rep.UnRef();

         m_rep = it.m_rep;
         return *this;
     }
         m_rep = it.m_rep;
         return *this;
     }


@@ -341,10 +341,13 @@ public:
         const wxString& name,
         wxPathFormat format = wxPATH_NATIVE) const = 0;
 
         const wxString& name,
         wxPathFormat format = wxPATH_NATIVE) const = 0;
 

+    // FIXME-UTF8: remove these from this file, they are used for ANSI
+    //             build only

     void SetConv(wxMBConv& conv) { m_pConv = &conv; }
     void SetConv(wxMBConv& conv) { m_pConv = &conv; }

-    wxMBConv& GetConv() const { return *m_pConv; }
+    wxMBConv& GetConv() const
+        { if (m_pConv) return *m_pConv; else return wxConvLocal; }

 
 

-    static const wxArchiveClassFactory *Find(const wxChar *protocol,
+    static const wxArchiveClassFactory *Find(const wxString& protocol,

                                              wxStreamProtocolType type
                                              = wxSTREAM_PROTOCOL);
 
                                              wxStreamProtocolType type
                                              = wxSTREAM_PROTOCOL);
 


@@ -363,7 +366,7 @@ protected:
     virtual wxArchiveInputStream  *DoNewStream(wxInputStream *stream) const = 0;
     virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0;
 
     virtual wxArchiveInputStream  *DoNewStream(wxInputStream *stream) const = 0;
     virtual wxArchiveOutputStream *DoNewStream(wxOutputStream *stream) const = 0;
 

-    wxArchiveClassFactory() : m_pConv(&wxConvLocal), m_next(this) { }
+    wxArchiveClassFactory() : m_pConv(NULL), m_next(this) { }

     wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f))
         { return *this; }
 
     wxArchiveClassFactory& operator=(const wxArchiveClassFactory& WXUNUSED(f))
         { return *this; }