Renamed wxStream::StreamSize() to wxStream::GetSize()

Add wxStream bool operator !().
  Made wxTextStream safe for conversion from/to Mac/DOS/Unix
  Added wxFrame::Iconize()
  Applied patch for stippled brushes.


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

include/wx/gtk/frame.h

@@ -91,11 +91,11 @@ public:
     virtual void MakeModal(bool modal = TRUE);
 
     virtual void SetIcon( const wxIcon &icon );
-    virtual void Iconize( bool WXUNUSED(iconize)) { }
-    virtual bool IsIconized() const { return FALSE; }
     bool Iconized() const { return IsIconized(); }
-    virtual void Maximize(bool WXUNUSED(maximize)) {}
+    virtual void Maximize( bool maximize );
-    virtual void Restore() {}
+    virtual void Restore();
+    virtual void Iconize( bool iconize );
+    virtual bool IsIconized() const;
 
     virtual void Command( int id );
     

include/wx/gtk1/frame.h

@@ -91,11 +91,11 @@ public:
     virtual void MakeModal(bool modal = TRUE);
 
     virtual void SetIcon( const wxIcon &icon );
-    virtual void Iconize( bool WXUNUSED(iconize)) { }
-    virtual bool IsIconized() const { return FALSE; }
     bool Iconized() const { return IsIconized(); }
-    virtual void Maximize(bool WXUNUSED(maximize)) {}
+    virtual void Maximize( bool maximize );
-    virtual void Restore() {}
+    virtual void Restore();
+    virtual void Iconize( bool iconize );
+    virtual bool IsIconized() const;
 
     virtual void Command( int id );
     

include/wx/mstream.h

@@ -22,7 +22,7 @@ class wxMemoryInputStream: public wxInputStream {
  public:
   wxMemoryInputStream(const char *data, size_t length);
   virtual ~wxMemoryInputStream();
-  virtual size_t StreamSize() const { return m_length; }
+  virtual size_t GetSize() const { return m_length; }
 
   char Peek();
 
@@ -41,7 +41,7 @@ class wxMemoryOutputStream:  public wxOutputStream {
  public:
   wxMemoryOutputStream(char *data = NULL, size_t length = 0);
   virtual ~wxMemoryOutputStream();
-  virtual size_t StreamSize() const { return m_o_streambuf->GetLastAccess(); }
+  virtual size_t GetSize() const { return m_o_streambuf->GetLastAccess(); }
 
   wxStreamBuffer *OutputStreamBuffer() const { return m_o_streambuf; }
 

include/wx/stream.h

@@ -55,8 +55,9 @@ class WXDLLEXPORT wxStreamBase {
   wxStreamBase();
   virtual ~wxStreamBase();
 
+  bool operator!() const { return (LastError() != wxSTR_NOERROR); }
   wxStreamError LastError() const { return m_lasterror; }
-  virtual size_t StreamSize() const { return ~((size_t)0); }
+  virtual size_t GetSize() const { return ~((size_t)0); }
 
  protected:
 
@@ -147,7 +148,7 @@ class WXDLLEXPORT wxFilterInputStream: public wxInputStream {
   char Peek() { return m_parent_i_stream->Peek(); }
 
   wxStreamError LastError() const { return m_parent_i_stream->LastError(); }
-  size_t StreamSize() const { return m_parent_i_stream->StreamSize(); }
+  size_t GetSize() const { return m_parent_i_stream->GetSize(); }
 
  protected:
   wxInputStream *m_parent_i_stream;
@@ -160,7 +161,7 @@ class WXDLLEXPORT wxFilterOutputStream: public wxOutputStream {
   ~wxFilterOutputStream();
 
   wxStreamError LastError() const { return m_parent_o_stream->LastError(); }
-  size_t StreamSize() const { return m_parent_o_stream->StreamSize(); }
+  size_t GetSize() const { return m_parent_o_stream->GetSize(); }
 
  protected:
   wxOutputStream *m_parent_o_stream;

include/wx/txtstrm.h

@@ -43,6 +43,9 @@ public:
 
  protected:
   wxInputStream *m_input;
+  
+  wxChar NextNonWhiteSpace();
+  void SkipIfEndOfLine( wxChar c );
 };
 
 class WXDLLEXPORT wxTextOutputStream {

include/wx/wfstream.h

@@ -33,7 +33,7 @@ class wxFileInputStream: public wxInputStream {
   ~wxFileInputStream();
 
   char Peek();
-  size_t StreamSize() const;
+  size_t GetSize() const;
 
   bool Ok() const { return m_file->IsOpened(); }
 
@@ -61,7 +61,7 @@ class wxFileOutputStream: public wxOutputStream {
 //     { return wxOutputStream::Write(buffer, size); }
 
   void Sync();
-  size_t StreamSize() const;
+  size_t GetSize() const;
 
   bool Ok() const { return m_file->IsOpened(); }
 

src/common/imagjpeg.cpp

@@ -106,10 +106,10 @@ void jpeg_wxio_src( j_decompress_ptr cinfo, wxInputStream& infile )
         src = (my_src_ptr) cinfo->src;
     }
     src = (my_src_ptr) cinfo->src;
-    src->pub.bytes_in_buffer = infile.StreamSize(); /* forces fill_input_buffer on first read */
+    src->pub.bytes_in_buffer = infile.GetSize(); /* forces fill_input_buffer on first read */
-    src->buffer = (JOCTET *) malloc (infile.StreamSize());
+    src->buffer = (JOCTET *) malloc (infile.GetSize());
     src->pub.next_input_byte = src->buffer; /* until buffer loaded */
-    infile.Read(src->buffer, infile.StreamSize());
+    infile.Read(src->buffer, infile.GetSize());
     
     src->pub.init_source = my_init_source;
     src->pub.fill_input_buffer = my_fill_input_buffer;

src/common/mstream.cpp

@@ -104,8 +104,8 @@ size_t wxMemoryOutputStream::CopyTo(char *buffer, size_t len) const
   if (!buffer)
     return 0;
 
-  if (len > StreamSize())
+  if (len > GetSize())
-    len = StreamSize();
+    len = GetSize();
 
   memcpy(buffer, m_o_streambuf->GetBufferStart(), len);
   return len;

src/common/txtstrm.cpp

@@ -25,6 +25,19 @@
 #include "wx/txtstrm.h"
 #include <ctype.h>
 
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+// Unix: "\n"
+// Dos:  "\r\n"
+// Mac:  "\r"
+
+// ----------------------------------------------------------------------------
+// wxTextInputStream
+// ----------------------------------------------------------------------------
+
 wxTextInputStream::wxTextInputStream(wxInputStream& s)
   : m_input(&s)
 {
@@ -34,39 +47,97 @@ wxTextInputStream::~wxTextInputStream()
 {
 }
 
+wxChar wxTextInputStream::NextNonWhiteSpace()
+{
+    wxChar c = (wxChar) 0;
+    for (;;)
+    {
+        c = m_input->GetC();
+	if (!m_input) return (wxChar) 0;
+	
+	if (c != _T('\n') && 
+	    c != _T('\r') &&
+	    c != _T('\t') &&
+	    c != _T(' '))
+	{
+	    return c;
+	}
+    }
+    
+    // this shouldn't happen
+    return (wxChar) 0;
+}
+
+void wxTextInputStream::SkipIfEndOfLine( wxChar c )
+{
+    if (c == _T('\n'))
+    { 
+        // eat on UNIX
+	return;
+    }
+    
+    if (c == _T('\r'))
+    {
+        // eat on both Mac and DOS
+	
+        wxChar c2 = m_input->GetC();
+        if (!m_input) return;
+	
+        if (c2 == _T('\n'))
+        {  
+	    // eat on DOS
+	    return;
+	}
+        else
+	{
+	    // Don't eat on Mac
+            m_input->Ungetch( c2 );
+	}
+    }
+    else
+    {
+        // no line terminator
+        m_input->Ungetch( c );
+    }
+}
+
 wxUint32 wxTextInputStream::Read32()
 {
     /* I only implemented a simple integer parser */
-  int c; 
     int sign;
     wxInt32 i;
     
-  while (isspace( c = m_input->GetC() ) )
+    int c = NextNonWhiteSpace();
-     /* Do nothing */ ;
+    if (!m_input) return 0;
 
     i = 0;
-  if (! (c == '-' || isdigit(c)) ) {
+    if (! (c == _T('-') || c == _T('+') || isdigit(c)) ) 
+    {
         m_input->Ungetch(c);
         return 0;
     }
 
-  if (c == '-') {
+    if (c == _T('-')) 
+    {
         sign = -1;
         c = m_input->GetC();
-  } else if (c == '+') {
+    } else 
+    if (c == _T('+')) 
+    {
         sign = 1;
         c = m_input->GetC();
-  } else {
+    } else 
+    {
         sign = 1;
     }
 
-  while (isdigit(c)) {
+    while (isdigit(c)) 
-    i = i*10 + (c - (int)'0');
+    {
+        i = i*10 + (c - (int)_T('0'));
         c = m_input->GetC();
     }
 
-  if (c != '\n' && c != '\r')
+    SkipIfEndOfLine( c );
-    m_input->Ungetch(c);
 
     i *= sign;
 
@@ -87,65 +158,76 @@ double wxTextInputStream::ReadDouble()
 {
     /* I only implemented a simple float parser */
     double f;
-  int c, sign;
+    int sign;
 
-  while (isspace( c = m_input->GetC() ) || c == '\n' || c == '\r')
+    int c = NextNonWhiteSpace();
-     /* Do nothing */ ;
+    if (!m_input) return 0.0;
 
     f = 0.0;
-  if (! (c == '-' || isdigit(c)) ) {
+    if (! (c == _T('.') || c == _T('-') || c == _T('+') || isdigit(c)) ) 
+    {
         m_input->Ungetch(c);
         return 0.0;
     }
 
-  if (c == '-') {
+    if (c == _T('-')) 
+    {
         sign = -1;
         c = m_input->GetC();
-  } else if (c == '+') {
+    } else 
+    if (c == _T('+')) 
+    {
         sign = 1;
         c = m_input->GetC();
-  } else {
+    } 
+    else 
+    {
         sign = 1;
     }
 
-  while (isdigit(c)) {
+    while (isdigit(c)) 
-    f = f*10 + (c - '0');
+    {
+        f = f*10 + (c - _T('0'));
         c = m_input->GetC();
     }
 
-  if (c == '.') {
+    if (c == _T('.')) 
+    {
         double f_multiplicator = (double) 0.1;
 
         c = m_input->GetC();
 
-    while (isdigit(c)) {
+        while (isdigit(c)) 
-      f += (c-'0')*f_multiplicator;
+	{
+            f += (c-_T('0'))*f_multiplicator;
             f_multiplicator /= 10;
             c = m_input->GetC();
         }
 
-    if (c == 'e') {
+        if (c == _T('e')) 
+	{
             double f_multiplicator = 0.0;
             int i, e;
 
             c = m_input->GetC();
 
-      switch(c) {
+            switch (c) 
-      case '-':
+	    {
-        f_multiplicator = 0.1;
+                case _T('-'): f_multiplicator = 0.1;  break;
-        break;
+		case _T('+'): f_multiplicator = 10.0; break;
-      case '+':
-        f_multiplicator = 10.0;
-        break;
 	    }
 
-      e = Read8();
+            e = Read8();  // why only max 256 ?
 
             for (i=0;i<e;i++)
                 f *= f_multiplicator;
-    } else if (c != '\n' && c != '\r')
+        } 
+	else
+	    SkipIfEndOfLine( c );
+    }
+    else
+    {
         m_input->Ungetch(c);
- 
     }
 
     f *= sign;
@@ -155,32 +237,43 @@ double wxTextInputStream::ReadDouble()
 
 wxString wxTextInputStream::ReadString()
 {
-  char c, last_endl = 0;
+    wxChar c;
-  bool end_line = FALSE;
     wxString line;
 
-  while (!end_line) {
+    for (;;) 
+    {
         c = m_input->GetC();
-    if (m_input->LastError() != wxStream_NOERROR)
+        if (!m_input) break;
-      break;
 	
-    switch (c) {
+        if (c == _T('\n'))
-    case '\n':
+        {
-      end_line = TRUE;
+	    // eat on UNIX
-      break;
-    case '\r':
-      last_endl = '\r';
-      break;
-    default:
-      if (last_endl == '\r') {
-        end_line = TRUE;
-        m_input->Ungetch(c);
 	    break;
 	}
+	
+        if (c == _T('\r'))
+        {
+            // eat on both Mac and DOS
+	    
+            wxChar c2 = m_input->GetC();
+	    if (!m_input) break;
+	    
+	    if (c2 == _T('\n'))
+            {  
+	        // eat on DOS
+		break;
+	    }
+            else
+	    {
+	        // Don't eat on Mac
+                m_input->Ungetch( c2 );
+		break;
+	    }
+        }
+	
         line += c;
-      break;
-    } 
     }
+    
     return line;
 }
   
@@ -192,10 +285,30 @@ wxTextInputStream& wxTextInputStream::operator>>(wxString& line)
 
 wxTextInputStream& wxTextInputStream::operator>>(wxChar& c)
 {
-  // TODO
+    wxChar c1 = m_input->GetC();
-/*
+    if (!m_input)
-  m_input->Read(&c, sizeof(wxChar));
+    {
-*/
+        c = (wxChar) 0;
+        return *this;
+    }
+    
+    if (c1 == _T('\r'))
+    {
+        c = _T('\n');
+        wxChar c2 = m_input->GetC();
+	if (!m_input) return *this;
+	    
+	if (c2 != _T('\n'))
+	{
+	    // we are on a Mac
+            m_input->Ungetch( c2 );
+	}
+    }
+    else
+    {
+        c = c1;
+    }
+    
     return *this;
 }
 
@@ -247,24 +360,24 @@ wxTextOutputStream::~wxTextOutputStream()
 void wxTextOutputStream::Write32(wxUint32 i)
 {
     wxString str;
-
     str.Printf(_T("%u"), i);
+    
     WriteString(str);
 }
 
 void wxTextOutputStream::Write16(wxUint16 i)
 {
     wxString str;
-
     str.Printf(_T("%u"), i);
+    
     WriteString(str);
 }
 
 void wxTextOutputStream::Write8(wxUint8 i)
 {
     wxString str;
-
     str.Printf(_T("%u"), i);
+    
     WriteString(str);
 }
 
@@ -278,13 +391,32 @@ void wxTextOutputStream::WriteDouble(double d)
 
 void wxTextOutputStream::WriteString(const wxString& string)
 {
-#if wxUSE_UNICODE
+    for (size_t i = 0; i < string.Len(); i++)
-  const wxWX2MBbuf buf = string.mb_str();
+    {
-  m_output->Write(buf, string.Len());
+        wxChar c = string[i];
+        if (c == _T('\n'))
+        {
+#if   defined(__WINDOWS__)
+            c = _T('\r');
+            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+            c = _T('\n');
+            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+#elif defined(__UNIX__)
+            c = _T('\n');
+            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+#elif defined(__WXMAC__)
+            c = _T('\r');
+            m_output->Write( (const void*)(&c), sizeof(wxChar) );
 #else
-  m_output->Write(string, string.Len());
+            #error  "wxTextOutputStream: unsupported platform."
 #endif
         }
+        else
+        {
+            m_output->Write( (const void*)(&c), sizeof(wxChar) );
+        }
+   }
+}
 
 wxTextOutputStream& wxTextOutputStream::operator<<(const wxChar *string)
 {
@@ -300,9 +432,7 @@ wxTextOutputStream& wxTextOutputStream::operator<<(const wxString& string)
 
 wxTextOutputStream& wxTextOutputStream::operator<<(wxChar c)
 {
-  wxString tmp_str;
+    WriteString( wxString(c) );
-  tmp_str.Printf(_T("%c"), c);
-  WriteString(tmp_str);
     return *this;
 }
 

src/common/wfstream.cpp

@@ -67,7 +67,7 @@ char wxFileInputStream::Peek()
   return 0;
 }
 
-size_t wxFileInputStream::StreamSize() const
+size_t wxFileInputStream::GetSize() const
 {
   return m_file->Length();
 }
@@ -161,7 +161,7 @@ void wxFileOutputStream::Sync()
   m_file->Flush();
 }
 
-size_t wxFileOutputStream::StreamSize() const
+size_t wxFileOutputStream::GetSize() const
 {
   return m_file->Length();
 }

src/gtk/dcclient.cpp

@@ -1010,7 +1010,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
     if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
     {
         if (m_brush.GetStipple()->GetPixmap())
-            gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
+            gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() );
         else
             gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() );
     }
@@ -1055,9 +1055,12 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
  
     gdk_gc_set_fill( m_bgGC, fillStyle );
   
-    if (m_backgroundBrush.GetStyle() == wxSTIPPLE)
+    if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
     {
-        gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
+        if (m_brush.GetStipple()->GetPixmap())
+            gdk_gc_set_tile( m_bgGC, m_brush.GetStipple()->GetPixmap() );
+        else
+            gdk_gc_set_stipple( m_bgGC, m_brush.GetStipple()->GetBitmap() );
     }
   
     if (IS_HATCH(m_backgroundBrush.GetStyle()))

src/gtk/frame.cpp

@@ -29,6 +29,7 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "gdk/gdkkeysyms.h"
+#include "gdk/gdkx.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -1043,3 +1044,25 @@ void wxFrame::SetIcon( const wxIcon &icon )
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
 
+void wxFrame::Maximize(bool WXUNUSED(maximize)) 
+{
+}
+
+void wxFrame::Restore() 
+{
+}
+
+void wxFrame::Iconize( bool iconize ) 
+{ 
+   if (iconize)
+   {
+        XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
+	                GDK_WINDOW_XWINDOW( m_widget->window ),
+			DefaultScreen( GDK_DISPLAY() ) );
+   }
+}
+
+bool wxFrame::IsIconized() const 
+{ 
+    return FALSE; 
+}

src/gtk1/dcclient.cpp

@@ -1010,7 +1010,7 @@ void wxWindowDC::SetBrush( const wxBrush &brush )
     if ((m_brush.GetStyle() == wxSTIPPLE) && (m_brush.GetStipple()->Ok()))
     {
         if (m_brush.GetStipple()->GetPixmap())
-            gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetPixmap() );
+            gdk_gc_set_tile( m_brushGC, m_brush.GetStipple()->GetPixmap() );
         else
             gdk_gc_set_stipple( m_brushGC, m_brush.GetStipple()->GetBitmap() );
     }
@@ -1055,9 +1055,12 @@ void wxWindowDC::SetBackground( const wxBrush &brush )
  
     gdk_gc_set_fill( m_bgGC, fillStyle );
   
-    if (m_backgroundBrush.GetStyle() == wxSTIPPLE)
+    if ((m_backgroundBrush.GetStyle() == wxSTIPPLE) && (m_backgroundBrush.GetStipple()->Ok()))
     {
-        gdk_gc_set_stipple( m_bgGC, m_backgroundBrush.GetStipple()->GetPixmap() );
+        if (m_brush.GetStipple()->GetPixmap())
+            gdk_gc_set_tile( m_bgGC, m_brush.GetStipple()->GetPixmap() );
+        else
+            gdk_gc_set_stipple( m_bgGC, m_brush.GetStipple()->GetBitmap() );
     }
   
     if (IS_HATCH(m_backgroundBrush.GetStyle()))

src/gtk1/frame.cpp

@@ -29,6 +29,7 @@
 #include "gtk/gtk.h"
 #include "wx/gtk/win_gtk.h"
 #include "gdk/gdkkeysyms.h"
+#include "gdk/gdkx.h"
 
 //-----------------------------------------------------------------------------
 // constants
@@ -1043,3 +1044,25 @@ void wxFrame::SetIcon( const wxIcon &icon )
     gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
 }
 
+void wxFrame::Maximize(bool WXUNUSED(maximize)) 
+{
+}
+
+void wxFrame::Restore() 
+{
+}
+
+void wxFrame::Iconize( bool iconize ) 
+{ 
+   if (iconize)
+   {
+        XIconifyWindow( GDK_WINDOW_XDISPLAY( m_widget->window ),
+	                GDK_WINDOW_XWINDOW( m_widget->window ),
+			DefaultScreen( GDK_DISPLAY() ) );
+   }
+}
+
+bool wxFrame::IsIconized() const 
+{ 
+    return FALSE; 
+}