X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/324eeecb3cdc9522e136af6670443148772b412a..9c805dec6caf3c98a3797898cffe795b5b56e606:/include/wx/palmos/window.h diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h index 40749393fe..4be644902d 100644 --- a/include/wx/palmos/window.h +++ b/include/wx/palmos/window.h @@ -16,10 +16,6 @@ // headers // --------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "window.h" -#endif - // [at least] some version of Windows send extra mouse move messages after // a mouse click or a key press - to temporarily fix this problem, set the // define below to 1 @@ -31,7 +27,7 @@ // wxWindow declaration for Palm // --------------------------------------------------------------------------- -class WXDLLEXPORT wxWindowPalm : public wxWindowBase +class WXDLLIMPEXP_CORE wxWindowPalm : public wxWindowBase { public: wxWindowPalm() { Init(); } @@ -57,8 +53,9 @@ public: const wxString& name = wxPanelNameStr); // implement base class pure virtuals - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; + + virtual void SetLabel( const wxString& label); + virtual wxString GetLabel() const; virtual void Raise(); virtual void Lower(); @@ -76,20 +73,12 @@ public: virtual void Refresh( bool eraseBackground = true, const wxRect *rect = NULL ); virtual void Update(); - virtual void Freeze(); - virtual void Thaw(); virtual bool SetCursor( const wxCursor &cursor ); virtual bool SetFont( const wxFont &font ); virtual int GetCharHeight() const; virtual int GetCharWidth() const; - virtual void GetTextExtent(const wxString& string, - int *x, int *y, - int *descent = (int *) NULL, - int *externalLeading = (int *) NULL, - const wxFont *theFont = (const wxFont *) NULL) - const; #if wxUSE_MENUS_NATIVE virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); @@ -102,7 +91,7 @@ public: virtual int GetScrollThumb( int orient ) const; virtual int GetScrollRange( int orient ) const; virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = (wxRect *) NULL ); + const wxRect* rect = NULL ); virtual bool ScrollLines(int lines); virtual bool ScrollPages(int pages); @@ -135,8 +124,9 @@ public: // simple accessors // ---------------- - virtual WXWINHANDLE GetWinHandle() const { return m_handle; } - virtual WXWidget GetHandle() const { return GetWinHandle(); } + WXHWND GetHWND() const { return m_hWnd; } + void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; } + virtual WXWidget GetHandle() const { return GetHWND(); } // event handlers // -------------- @@ -211,11 +201,11 @@ public: protected: // the window handle - WinHandle m_handle; - FormType *FrameForm; + WXHWND m_hWnd; + WXFORMPTR FrameForm; - FormType *GetFormPtr(); - void SetFormPtr(FormType *FormPtr); + WXFORMPTR GetFormPtr(); + void SetFormPtr(WXFORMPTR FormPtr); // additional (Palm specific) flags bool m_mouseInWindow:1; @@ -235,6 +225,11 @@ protected: WXHMENU m_hMenu; // Menu, if any // implement the base class pure virtuals + virtual void DoGetTextExtent(const wxString& string, + int *x, int *y, + int *descent = NULL, + int *externalLeading = NULL, + const wxFont *font = NULL) const; virtual void DoClientToScreen( int *x, int *y ) const; virtual void DoScreenToClient( int *x, int *y ) const; virtual void DoGetPosition( int *x, int *y ) const; @@ -273,14 +268,8 @@ private: bool HandleMoving(wxRect& rect); bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags); - // list of disabled children before last call to our Disable() - wxWindowList *m_childrenDisabled; - - // number of calls to Freeze() minus number of calls to Thaw() - unsigned int m_frozenness; - DECLARE_DYNAMIC_CLASS(wxWindowPalm) - DECLARE_NO_COPY_CLASS(wxWindowPalm) + wxDECLARE_NO_COPY_CLASS(wxWindowPalm); DECLARE_EVENT_TABLE() };