Theme fix for Mac

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

diff --git a/include/wx/motif/textctrl.h b/include/wx/motif/textctrl.h
index c8037713c796a30b313e8f886cbe6fc840a1a5d3..22b8f50eebc7985b7137ad0f26fb497dfe9a92e1 100644 (file)
--- a/include/wx/motif/textctrl.h
+++ b/include/wx/motif/textctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        textctrl.h
+// Name:        wx/motif/textctrl.h

 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     wxTextCtrl class
 // Author:      Julian Smart
 // Modified by:


@@ -12,15 +12,11 @@
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 
 #ifndef _WX_TEXTCTRL_H_
 #define _WX_TEXTCTRL_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "textctrl.h"
-#endif
-

 // Single-line text item
 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)
 // Single-line text item
 class WXDLLEXPORT wxTextCtrl : public wxTextCtrlBase
 {
     DECLARE_DYNAMIC_CLASS(wxTextCtrl)

-        
+

 public:
     // creation
     // --------
 public:
     // creation
     // --------


@@ -36,26 +32,25 @@ public:
     {
         Create(parent, id, value, pos, size, style, validator, name);
     }
     {
         Create(parent, id, value, pos, size, style, validator, name);
     }

-    
+

     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxTextCtrlNameStr);
     bool Create(wxWindow *parent, wxWindowID id,
         const wxString& value = wxEmptyString,
         const wxPoint& pos = wxDefaultPosition,
         const wxSize& size = wxDefaultSize, long style = 0,
         const wxValidator& validator = wxDefaultValidator,
         const wxString& name = wxTextCtrlNameStr);

-    
+

     // accessors
     // ---------
     virtual wxString GetValue() const;
     // accessors
     // ---------
     virtual wxString GetValue() const;

-    virtual void SetValue(const wxString& value);
-    
+

     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;
     virtual int GetLineLength(long lineNo) const;
     virtual wxString GetLineText(long lineNo) const;
     virtual int GetNumberOfLines() const;

-    
+

     // operations
     // ----------
     // operations
     // ----------

-    
+

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


@@ -63,18 +58,18 @@ public:
     virtual bool CanCopy() const;
     virtual bool CanCut() const;
     virtual bool CanPaste() const;
     virtual bool CanCopy() const;
     virtual bool CanCut() const;
     virtual bool CanPaste() const;

-    
+

     // Undo/redo
     virtual void Undo();
     virtual void Redo();
     // Undo/redo
     virtual void Undo();
     virtual void Redo();

-    
+

     virtual bool CanUndo() const;
     virtual bool CanRedo() const;
     virtual bool CanUndo() const;
     virtual bool CanRedo() const;

-    
+

     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;
     virtual void SetInsertionPoint(long pos);
     virtual void SetInsertionPointEnd();
     virtual long GetInsertionPoint() const;

-    virtual long GetLastPosition() const;
+    virtual wxTextPos GetLastPosition() const;

     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);
     virtual void Replace(long from, long to, const wxString& value);
     virtual void Remove(long from, long to);
     virtual void SetSelection(long from, long to);


@@ -83,63 +78,66 @@ public:
     // selection.
     virtual void GetSelection(long* from, long* to) const;
     virtual bool IsEditable() const ;
     // selection.
     virtual void GetSelection(long* from, long* to) const;
     virtual bool IsEditable() const ;

-    
+

     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
     virtual void MarkDirty();
     virtual void DiscardEdits();
     virtual bool IsModified() const;
     virtual void WriteText(const wxString& text);
     virtual void AppendText(const wxString& text);
     virtual void MarkDirty();
     virtual void DiscardEdits();
     virtual bool IsModified() const;

-    
+

     virtual long XYToPosition(long x, long y) const;
     virtual bool PositionToXY(long pos, long *x, long *y) const;
     virtual void ShowPosition(long pos);
     virtual void Clear();
     virtual long XYToPosition(long x, long y) const;
     virtual bool PositionToXY(long pos, long *x, long *y) const;
     virtual void ShowPosition(long pos);
     virtual void Clear();

-    
+

     // callbacks
     // ---------
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event);
     //  void OnEraseBackground(wxEraseEvent& event);
     // callbacks
     // ---------
     void OnDropFiles(wxDropFilesEvent& event);
     void OnChar(wxKeyEvent& event);
     //  void OnEraseBackground(wxEraseEvent& event);

-    
+

     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);
     void OnCut(wxCommandEvent& event);
     void OnCopy(wxCommandEvent& event);
     void OnPaste(wxCommandEvent& event);
     void OnUndo(wxCommandEvent& event);
     void OnRedo(wxCommandEvent& event);

-    
+

     void OnUpdateCut(wxUpdateUIEvent& event);
     void OnUpdateCopy(wxUpdateUIEvent& event);
     void OnUpdatePaste(wxUpdateUIEvent& event);
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);
     void OnUpdateCut(wxUpdateUIEvent& event);
     void OnUpdateCopy(wxUpdateUIEvent& event);
     void OnUpdatePaste(wxUpdateUIEvent& event);
     void OnUpdateUndo(wxUpdateUIEvent& event);
     void OnUpdateRedo(wxUpdateUIEvent& event);

-    
+

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

-    
+

     // implementation from here to the end
     // -----------------------------------
     // implementation from here to the end
     // -----------------------------------

-    virtual void ChangeFont(bool keepOriginalSize = TRUE);
+    virtual void ChangeFont(bool keepOriginalSize = true);

     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     void SetModified(bool mod) { m_modified = mod; }
     virtual WXWidget GetTopWidget() const;
     virtual void ChangeBackgroundColour();
     virtual void ChangeForegroundColour();
     void SetModified(bool mod) { m_modified = mod; }
     virtual WXWidget GetTopWidget() const;

-    
+

     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
         long keycode);
     // send the CHAR and TEXT_UPDATED events
     void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
         long keycode);

-    
+

 protected:
     wxString  m_fileName;
 
     virtual wxSize DoGetBestSize() const;
 protected:
     wxString  m_fileName;
 
     virtual wxSize DoGetBestSize() const;

+
+    virtual void DoSetValue(const wxString& value, int flags = 0);
+

 public:
     // Motif-specific
     void*     m_tempCallbackStruct;
     bool      m_modified;
     wxString  m_value;            // Required for password text controls
 public:
     // Motif-specific
     void*     m_tempCallbackStruct;
     bool      m_modified;
     wxString  m_value;            // Required for password text controls

-    
+

     // Did we call wxTextCtrl::OnChar? If so, generate a command event.
     bool      m_processedDefault;
     // Did we call wxTextCtrl::OnChar? If so, generate a command event.
     bool      m_processedDefault;

-    
+

 private:
     DECLARE_EVENT_TABLE()
 };
 private:
     DECLARE_EVENT_TABLE()
 };