fixes for Sun CC 5.0 (unlike 4.2 it understands bool)

[wxWidgets.git] / include / wx / gtk1 / textctrl.h

diff --git a/include/wx/gtk1/textctrl.h b/include/wx/gtk1/textctrl.h
index 525b11808fa6041292bd5abeefe37e406aea8d93..da978601d18a3828bd7de81f77df28fc40788fed 100644 (file)
--- a/include/wx/gtk1/textctrl.h
+++ b/include/wx/gtk1/textctrl.h
@@ -21,12 +21,20 @@
 #include "wx/string.h"
 #include "wx/control.h"
 
 #include "wx/string.h"
 #include "wx/control.h"
 

+#if wxUSE_STD_IOSTREAM
+

 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
 #endif
 
 #if wxUSE_IOSTREAMH
 #include <iostream.h>
 #else
 #include <iostream>
 #endif
 

+#else
+
+#define NO_TEXT_WINDOW_STREAM
+
+#endif
+

 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // classes
 //-----------------------------------------------------------------------------


@@ -43,7 +51,11 @@ extern const char *wxTextCtrlNameStr;
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 
 //  wxTextCtrl
 //-----------------------------------------------------------------------------
 

+#ifndef NO_TEXT_WINDOW_STREAM

 class wxTextCtrl: public wxControl, public streambuf
 class wxTextCtrl: public wxControl, public streambuf

+#else
+class wxTextCtrl: public wxControl
+#endif

 {
   DECLARE_EVENT_TABLE()
   DECLARE_DYNAMIC_CLASS(wxTextCtrl);
 {
   DECLARE_EVENT_TABLE()
   DECLARE_DYNAMIC_CLASS(wxTextCtrl);


@@ -89,6 +101,7 @@ class wxTextCtrl: public wxControl, public streambuf
 
     void OnChar( wxKeyEvent &event );
 
 
     void OnChar( wxKeyEvent &event );
 

+#ifndef NO_TEXT_WINDOW_STREAM

     int overflow(int i);
     int sync();
     int underflow();
     int overflow(int i);
     int sync();
     int underflow();


@@ -99,19 +112,25 @@ class wxTextCtrl: public wxControl, public streambuf
     wxTextCtrl& operator<<(float f);
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);
     wxTextCtrl& operator<<(float f);
     wxTextCtrl& operator<<(double d);
     wxTextCtrl& operator<<(const char c);

+#endif

 
     void SetFont( const wxFont &font );
 
     void SetFont( const wxFont &font );

-    virtual void SetBackgroundColour(const wxColour &colour);
+    void SetForegroundColour(const wxColour &colour);
+    void SetBackgroundColour(const wxColour &colour);

 
   // implementation    
     
 
   // implementation    
     

-    GtkWidget* GetConnectWidget(void);
+    GtkWidget* GetConnectWidget();

     bool IsOwnGtkWindow( GdkWindow *window );
     bool IsOwnGtkWindow( GdkWindow *window );

+    void ApplyWidgetStyle();
+    void CalculateScrollbar();

     
   private:
   
     bool        m_modified;
     GtkWidget  *m_text;
     
   private:
   
     bool        m_modified;
     GtkWidget  *m_text;

+    GtkWidget  *m_vScrollbar;
+    bool        m_vScrollbarVisible;

 };
 
 #endif // __GTKTEXTCTRLH__
 };
 
 #endif // __GTKTEXTCTRLH__