For wxMSW, split XPM handler into separate file (please add handler explicitly in...

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

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index 6cc2b83033a433b0397301e61e6620394c32fa4f..984432970f204f2f3558fdbccb043b54e08de3ed 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/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>


@@ -78,7 +78,6 @@ public:
 
   // operations
   // ----------
 
   // operations
   // ----------

-  virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);

   
   // Clipboard operations
   virtual void Copy();
   
   // Clipboard operations
   virtual void Copy();


@@ -122,16 +121,27 @@ public:
   // callbacks
   // ---------
   void OnDropFiles(wxDropFilesEvent& event);
   // callbacks
   // ---------
   void OnDropFiles(wxDropFilesEvent& event);

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

 //  void OnEraseBackground(wxEraseEvent& event);
   
 //  void OnEraseBackground(wxEraseEvent& event);
   

-  // Implementation
-  // --------------

   virtual void Command(wxCommandEvent& event);
 
   virtual void Command(wxCommandEvent& event);
 

+// Implementation
+  virtual void ChangeFont(bool keepOriginalSize = TRUE);
+  virtual void ChangeBackgroundColour();
+  virtual void ChangeForegroundColour();
+  inline void SetModified(bool mod) { m_modified = mod; }
+  virtual WXWidget GetTopWidget() const;
+

 protected:
   wxString  m_fileName;
 protected:
   wxString  m_fileName;

-  
+public:
+  // Motif-specific
+  void*     m_tempCallbackStruct;
+  bool      m_modified;
+  wxString  m_value; // Required for password text controls
+  bool      m_processedDefault; // Did we call wxTextCtrl::OnChar?
+                                // If so, generate a command event.

   DECLARE_EVENT_TABLE()
 };
 
   DECLARE_EVENT_TABLE()
 };