don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 80fa7e285e1e02e7de4f48f98d5942e715cc8b99..f379d8a5c650835e151636bb861e5d44dc6dcdd6 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -22,11 +22,11 @@ class WXDLLIMPEXP_BASE wxDataInputStream
 {
 public:
 #if wxUSE_UNICODE
 {
 public:
 #if wxUSE_UNICODE

-    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvAuto());
+    wxDataInputStream(wxInputStream& s, const wxMBConv& conv = wxConvUTF8 );

 #else
     wxDataInputStream(wxInputStream& s);
 #endif
 #else
     wxDataInputStream(wxInputStream& s);
 #endif

-    ~wxDataInputStream(){}
+    ~wxDataInputStream();

 
     bool IsOk() { return m_input->IsOk(); }
 
 
     bool IsOk() { return m_input->IsOk(); }
 


@@ -78,26 +78,31 @@ public:
     wxDataInputStream& operator>>(float& f);
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
     wxDataInputStream& operator>>(float& f);
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }

+    
+#if wxUSE_UNICODE
+    void SetConv( const wxMBConv &conv );
+    wxMBConv *GetConv() const { return m_conv; }
+#endif

 
 protected:
     wxInputStream *m_input;
     bool m_be_order;
 #if wxUSE_UNICODE
 
 protected:
     wxInputStream *m_input;
     bool m_be_order;
 #if wxUSE_UNICODE

-    wxMBConv m_conv;
+    wxMBConv *m_conv;

 #endif
 
 #endif
 

-    DECLARE_NO_COPY_CLASS(wxDataInputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataInputStream);

 };
 
 class WXDLLIMPEXP_BASE wxDataOutputStream
 {
 public:
 #if wxUSE_UNICODE
 };
 
 class WXDLLIMPEXP_BASE wxDataOutputStream
 {
 public:
 #if wxUSE_UNICODE

-    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvAuto());
+    wxDataOutputStream(wxOutputStream& s, const wxMBConv& conv = wxConvUTF8 );

 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif
 #else
     wxDataOutputStream(wxOutputStream& s);
 #endif

-    ~wxDataOutputStream(){}
+    ~wxDataOutputStream();

 
     bool IsOk() { return m_output->IsOk(); }
 
 
     bool IsOk() { return m_output->IsOk(); }
 


@@ -132,7 +137,6 @@ public:
     void Write8(const wxUint8 *buffer, size_t size);
     void WriteDouble(const double *buffer, size_t size);
 
     void Write8(const wxUint8 *buffer, size_t size);
     void WriteDouble(const double *buffer, size_t size);
 

-    wxDataOutputStream& operator<<(const wxChar *string);

     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);
     wxDataOutputStream& operator<<(wxInt16 i);
     wxDataOutputStream& operator<<(const wxString& string);
     wxDataOutputStream& operator<<(wxInt8 c);
     wxDataOutputStream& operator<<(wxInt16 i);


@@ -153,14 +157,19 @@ public:
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
 
 
     void BigEndianOrdered(bool be_order) { m_be_order = be_order; }
 

+#if wxUSE_UNICODE
+    void SetConv( const wxMBConv &conv );
+    wxMBConv *GetConv() const { return m_conv; }
+#endif
+

 protected:
     wxOutputStream *m_output;
     bool m_be_order;
 #if wxUSE_UNICODE
 protected:
     wxOutputStream *m_output;
     bool m_be_order;
 #if wxUSE_UNICODE

-    wxMBConv m_conv;
+    wxMBConv *m_conv;

 #endif
 
 #endif
 

-    DECLARE_NO_COPY_CLASS(wxDataOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataOutputStream);

 };
 
 #endif
 };
 
 #endif