Better fix

[wxWidgets.git] / include / wx / palmos / toplevel.h

diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index 9783f91ad6e8486d9b621096ae0811e25e01d479..a931c9e3b9bd9058ad96565fc8a306b232f17bb1 100644 (file)
--- a/include/wx/palmos/toplevel.h
+++ b/include/wx/palmos/toplevel.h
@@ -12,10 +12,6 @@
 #ifndef _WX_PALMOS_TOPLEVEL_H_
 #define _WX_PALMOS_TOPLEVEL_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "toplevel.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm
 // ----------------------------------------------------------------------------
@@ -50,12 +46,15 @@ public:
     virtual ~wxTopLevelWindowPalm();
 
     // implement base class pure virtuals
+
+    virtual void SetTitle( const wxString& title);
+    virtual wxString GetTitle() const;
+
     virtual void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);
     virtual bool IsIconized() const;
-    virtual void SetIcon(const wxIcon& icon);
-    virtual void SetIcons(const wxIconBundle& icons );
+    virtual void SetIcons(const wxIconBundle& icons);
     virtual void Restore();
 
 #ifndef __WXWINCE__
@@ -81,19 +80,29 @@ public:
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
+    // interface to native frame structure
+    WXFORMPTR GetForm() const;
+
+    // handle native events
+    bool HandleControlSelect(WXEVENTPTR event);
+    bool HandleControlRepeat(WXEVENTPTR event);
+    bool HandleSize(WXEVENTPTR event);
+
+    virtual WXWINHANDLE GetWinHandle() const;
+
 protected:
     // common part of all ctors
     void Init();
 
+    // getting and setting sizes
+    virtual void DoGetSize( int *width, int *height ) const;
+
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // translate wxWidgets flags to Windows ones
     virtual WXDWORD PalmGetStyle(long flags, WXDWORD *exstyle) const;
 
-    // choose the right parent to use with CreateWindow()
-    virtual WXHWND PalmGetParent() const;
-
     // is the window currently iconized?
     bool m_iconized;
 
@@ -115,7 +124,4 @@ protected:
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm)
 };
 
-static Boolean FrameFormHandleEvent(EventType* pEvent);
-
 #endif // _WX_PALMOS_TOPLEVEL_H_
-