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 ef049c9f2afe80a20f7fd8bb41751a3bdc1a2af4..f379d8a5c650835e151636bb861e5d44dc6dcdd6 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -22,7 +22,7 @@ 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


@@ -78,6 +78,11 @@ 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;
 
 protected:
     wxInputStream *m_input;


@@ -86,14 +91,14 @@ protected:
     wxMBConv *m_conv;
 #endif
 
     wxMBConv *m_conv;
 #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


@@ -152,6 +157,11 @@ 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;
 protected:
     wxOutputStream *m_output;
     bool m_be_order;


@@ -159,7 +169,7 @@ protected:
     wxMBConv *m_conv;
 #endif
 
     wxMBConv *m_conv;
 #endif
 

-    DECLARE_NO_COPY_CLASS(wxDataOutputStream)
+    wxDECLARE_NO_COPY_CLASS(wxDataOutputStream);

 };
 
 #endif
 };
 
 #endif