updated headers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64187 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/iphone/chkconf.h b/include/wx/osx/iphone/chkconf.h
index dd53b32f50ca0f1b3395e9aaa607de5af99fbf3c..caf0a2ff577b9e82819b6f4ed8671d9a46305373 100644 (file)
--- a/include/wx/osx/iphone/chkconf.h
+++ b/include/wx/osx/iphone/chkconf.h
@@ -95,9 +95,7 @@
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR
 
 #undef wxUSE_STATUSBAR
 #undef wxUSE_NATIVE_STATUSBAR

-#undef wxUSE_TEXTCTRL

 #undef wxUSE_ABOUTDLG
 #undef wxUSE_ABOUTDLG

-#undef wxUSE_STATTEXT

 #undef wxUSE_STATLINE
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP
 #undef wxUSE_STATLINE
 #undef wxUSE_COLLPANE
 #undef wxUSE_STATBMP


@@ -109,9 +107,7 @@
 
 #define wxUSE_STATUSBAR 0
 #define wxUSE_NATIVE_STATUSBAR 0
 
 #define wxUSE_STATUSBAR 0
 #define wxUSE_NATIVE_STATUSBAR 0

-#define wxUSE_TEXTCTRL 0

 #define wxUSE_ABOUTDLG 0
 #define wxUSE_ABOUTDLG 0

-#define wxUSE_STATTEXT 0

 #define wxUSE_STATLINE 0
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0
 #define wxUSE_STATLINE 0
 #define wxUSE_COLLPANE 0
 #define wxUSE_STATBMP 0


@@ -134,12 +130,10 @@
 #undef wxUSE_BITMAPCOMBOBOX
 #undef wxUSE_BMPBUTTON
 #undef wxUSE_CHECKLISTBOX
 #undef wxUSE_BITMAPCOMBOBOX
 #undef wxUSE_BMPBUTTON
 #undef wxUSE_CHECKLISTBOX

-#undef wxUSE_GAUGE

 #undef wxUSE_GRID
 #undef wxUSE_LISTBOX
 #undef wxUSE_LISTCTRL
 #undef wxUSE_NOTEBOOK
 #undef wxUSE_GRID
 #undef wxUSE_LISTBOX
 #undef wxUSE_LISTCTRL
 #undef wxUSE_NOTEBOOK

-#undef wxUSE_SLIDER

 #undef wxUSE_SPINBTN
 #undef wxUSE_SPINCTRL
 #undef wxUSE_TREECTRL
 #undef wxUSE_SPINBTN
 #undef wxUSE_SPINCTRL
 #undef wxUSE_TREECTRL


@@ -165,12 +159,10 @@
 #define wxUSE_BITMAPCOMBOBOX 0
 #define wxUSE_BMPBUTTON 0
 #define wxUSE_CHECKLISTBOX 0
 #define wxUSE_BITMAPCOMBOBOX 0
 #define wxUSE_BMPBUTTON 0
 #define wxUSE_CHECKLISTBOX 0

-#define wxUSE_GAUGE 0

 #define wxUSE_GRID 0
 #define wxUSE_LISTBOX 0
 #define wxUSE_LISTCTRL 0
 #define wxUSE_NOTEBOOK 0
 #define wxUSE_GRID 0
 #define wxUSE_LISTBOX 0
 #define wxUSE_LISTCTRL 0
 #define wxUSE_NOTEBOOK 0

-#define wxUSE_SLIDER 0

 #define wxUSE_SPINBTN 0
 #define wxUSE_SPINCTRL 0
 #define wxUSE_TREECTRL 0
 #define wxUSE_SPINBTN 0
 #define wxUSE_SPINCTRL 0
 #define wxUSE_TREECTRL 0

diff --git a/include/wx/osx/iphone/private.h b/include/wx/osx/iphone/private.h
index 0a698a7bbbf0e27a58a20d5e71ce3615c4993369..d41cfdfb62064e8c6cc91c69b3372cbdc36c4621 100644 (file)
--- a/include/wx/osx/iphone/private.h
+++ b/include/wx/osx/iphone/private.h
@@ -50,6 +50,7 @@ public :
     virtual WXWidget    GetWXWidget() const { return m_osxView; }
 
     virtual void        SetBackgroundColour( const wxColour& col ) ;
     virtual WXWidget    GetWXWidget() const { return m_osxView; }
 
     virtual void        SetBackgroundColour( const wxColour& col ) ;

+    virtual bool        SetBackgroundStyle(wxBackgroundStyle style) ;

 
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
     virtual void        Move(int x, int y, int width, int height);
 
     virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
     virtual void        Move(int x, int y, int width, int height);


@@ -110,8 +111,8 @@ public :
 
     // action
 
 
     // action
 

-    virtual void        touchUpInsideAction(void* sender, WX_UIEvent evt, WXWidget slf, void* _cmd);
-
+    virtual void        controlAction(void* sender, wxUint32 controlEvent, WX_UIEvent rawEvent);
+    virtual void         controlTextDidChange();

 protected:
     WXWidget m_osxView;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl)
 protected:
     WXWidget m_osxView;
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl)


@@ -128,6 +129,7 @@ public :
     virtual void WillBeDestroyed() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;
     virtual void WillBeDestroyed() ;
     void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
     long style, long extraStyle, const wxString& name ) ;

+    void Create( wxWindow* parent, WXWindow nativeWindow );

 
     WXWindow GetWXWindow() const;
     void Raise();
 
     WXWindow GetWXWindow() const;
     void Raise();


@@ -204,6 +206,7 @@ protected :
 
     @end // wxUIView
 
 
     @end // wxUIView
 

+

     void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
 
 #endif
     void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
 
 #endif