correct access for virtuals, unneeded includes

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

diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index f53a646cff2b78ef5a2714cf8a68acf2129ef538..08954715afd4489916335e24b25bc76de519c22d 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_
 
 #ifndef _WX_PALMOS_TOPLEVEL_H_
 #define _WX_PALMOS_TOPLEVEL_H_
 

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

 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxTopLevelWindowPalm
 // ----------------------------------------------------------------------------


@@ -50,6 +46,10 @@ public:
     virtual ~wxTopLevelWindowPalm();
 
     // implement base class pure virtuals
     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 void Maximize(bool maximize = true);
     virtual bool IsMaximized() const;
     virtual void Iconize(bool iconize = true);


@@ -82,21 +82,28 @@ public:
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
     // interface to native frame structure
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
     // interface to native frame structure

-    FormType *GetForm();
+    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();
 
 
 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;
 
     // 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;
 
     // is the window currently iconized?
     bool m_iconized;
 


@@ -118,7 +125,4 @@ protected:
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm)
 };
 
     DECLARE_NO_COPY_CLASS(wxTopLevelWindowPalm)
 };
 

-static Boolean FrameFormHandleEvent(EventType* pEvent);
-

 #endif // _WX_PALMOS_TOPLEVEL_H_
 #endif // _WX_PALMOS_TOPLEVEL_H_

-