X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a31a5f85341a2ef131d86a1dee12f3d6c8156118..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/mac/textctrl.h diff --git a/include/wx/mac/textctrl.h b/include/wx/mac/textctrl.h index 4ef850483b..6801d6d0b9 100644 --- a/include/wx/mac/textctrl.h +++ b/include/wx/mac/textctrl.h @@ -6,20 +6,19 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TEXTCTRL_H_ #define _WX_TEXTCTRL_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "textctrl.h" #endif #include "wx/control.h" -WXDLLEXPORT_DATA(extern const char*) wxTextCtrlNameStr; -WXDLLEXPORT_DATA(extern const char*) wxEmptyString; +WXDLLEXPORT_DATA(extern const wxChar*) wxTextCtrlNameStr; // Single-line text item class WXDLLEXPORT wxTextCtrl: public wxTextCtrlBase @@ -151,11 +150,11 @@ public: void OnUpdateUndo(wxUpdateUIEvent& event); void OnUpdateRedo(wxUpdateUIEvent& event); - virtual bool MacCanFocus() const { return true ; } + virtual bool MacCanFocus() const { return true ; } virtual bool MacSetupCursor( const wxPoint& pt ) ; - virtual void MacSuperShown( bool show ) ; - virtual bool Show(bool show = TRUE) ; + virtual void MacSuperShown( bool show ) ; + virtual bool Show(bool show = TRUE) ; protected: virtual wxSize DoGetBestSize() const;