some Linux compilation fixes

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

diff --git a/include/wx/stubs/textctrl.h b/include/wx/stubs/textctrl.h
index a4efeba67c681d549c69218dfc425b697fe5e372..253491eaa0a5d5e13ae4666c60dd7c415a82f160 100644 (file)
--- a/include/wx/stubs/textctrl.h
+++ b/include/wx/stubs/textctrl.h
@@ -18,7 +18,7 @@
 
 #include "wx/control.h"
 
 
 #include "wx/control.h"
 

-#if USE_IOSTREAMH
+#if wxUSE_IOSTREAMH

 #include <iostream.h>
 #else
 #include <iostream>
 #include <iostream.h>
 #else
 #include <iostream>


@@ -30,9 +30,7 @@ WXDLLEXPORT_DATA(extern const char*) wxEmptyString;
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxControl
 
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl: public wxControl
 

-// 16-bit Borland 4.0 doesn't seem to allow multiple inheritance with wxWindow and streambuf:
-// it complains about deriving a huge class from the huge class streambuf. !!
-// Also, can't use streambuf if making or using a DLL :-(
+// TODO Some platforms/compilers don't like inheritance from streambuf.

 
 #if (defined(__BORLANDC__) && !defined(__WIN32__)) || defined(__MWERKS__)
 #define NO_TEXT_WINDOW_STREAM
 
 #if (defined(__BORLANDC__) && !defined(__WIN32__)) || defined(__MWERKS__)
 #define NO_TEXT_WINDOW_STREAM


@@ -124,15 +122,15 @@ public:
   // callbacks
   // ---------
   void OnDropFiles(wxDropFilesEvent& event);
   // callbacks
   // ---------
   void OnDropFiles(wxDropFilesEvent& event);

-  void OnChar(wxKeyEvent& event); // Process 'enter' if required
-  void OnEraseBackground(wxEraseEvent& event);
+//  void OnChar(wxKeyEvent& event); // Process 'enter' if required
+//  void OnEraseBackground(wxEraseEvent& event);

   
   // Implementation
   // --------------
   virtual void Command(wxCommandEvent& event);
 
 protected:
   
   // Implementation
   // --------------
   virtual void Command(wxCommandEvent& event);
 
 protected:

-  wxString  fileName;
+  wxString  m_fileName;

   
   DECLARE_EVENT_TABLE()
 };
   
   DECLARE_EVENT_TABLE()
 };