Better fix

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

diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index 73a44916b40ba6476c5ced1c6848883e59442e05..a931c9e3b9bd9058ad96565fc8a306b232f17bb1 100644 (file)
--- a/include/wx/palmos/toplevel.h
+++ b/include/wx/palmos/toplevel.h
@@ -2,20 +2,16 @@
 // Name:        wx/palmos/toplevel.h
 // Purpose:     wxTopLevelWindow
 // Author:      William Osborne - minimal working wxPalmOS port
 // Name:        wx/palmos/toplevel.h
 // Purpose:     wxTopLevelWindow
 // Author:      William Osborne - minimal working wxPalmOS port

-// Modified by:
+// Modified by: Wlodzimierz ABX Skiba - more than minimal functionality

 // Created:     10/13/04
 // RCS-ID:      $Id$
 // Created:     10/13/04
 // RCS-ID:      $Id$

-// Copyright:   (c) William Osborne
+// Copyright:   (c) William Osborne, Wlodzimierz Skiba

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALMOS_TOPLEVEL_H_
 #define _WX_PALMOS_TOPLEVEL_H_
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_PALMOS_TOPLEVEL_H_
 #define _WX_PALMOS_TOPLEVEL_H_
 

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

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


@@ -47,24 +43,18 @@ public:
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 
                 long style = wxDEFAULT_FRAME_STYLE,
                 const wxString& name = wxFrameNameStr);
 

-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style,
-                const wxString& name,
-                wxFrame* PFrame);
-

     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 bool IsIconized() 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__
     virtual void Restore();
 
 #ifndef __WXWINCE__


@@ -90,21 +80,22 @@ public:
     void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
     wxWindow *GetLastFocus() const { return m_winLastFocused; }
 
     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();
 
 protected:
     // common part of all ctors
     void Init();
 

-    // create a new frame, return false if it couldn't be created
-    bool CreateFrame(const wxString& title,
-                     const wxPoint& pos,
-                     const wxSize& size);
-
-    // create a new dialog using the given dialog template from resources,
-    // return false if it couldn't be created
-    bool CreateDialog(const void *dlgTemplate,
-                      const wxString& title,
-                      const wxPoint& pos,
-                      const wxSize& size);
+    // getting and setting sizes
+    virtual void DoGetSize( int *width, int *height ) const;

 
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);
 
     // common part of Iconize(), Maximize() and Restore()
     void DoShowWindow(int nShowCmd);


@@ -112,9 +103,6 @@ protected:
     // translate wxWidgets flags to Windows ones
     virtual WXDWORD PalmGetStyle(long flags, WXDWORD *exstyle) const;
 
     // 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;
 


@@ -136,7 +124,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_

-