Corrected/added support for column headers with icon and text

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

diff --git a/include/wx/palmos/toplevel.h b/include/wx/palmos/toplevel.h
index 85630b6943caed3d35df395106a0982cfdcc00e6..c6909432597c95f52183885df5d553adf3667494 100644 (file)
--- a/include/wx/palmos/toplevel.h
+++ b/include/wx/palmos/toplevel.h
@@ -12,15 +12,11 @@
 #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
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTopLevelWindowPalm : public wxTopLevelWindowBase
+class WXDLLIMPEXP_CORE wxTopLevelWindowPalm : public wxTopLevelWindowBase

 {
 public:
     // constructors and such
 {
 public:
     // constructors and such


@@ -50,12 +46,15 @@ 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 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__


@@ -82,12 +81,14 @@ 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() const;
+    WXFORMPTR GetForm() const;

 
     // handle native events
 
     // handle native events

-    bool HandleControlSelect(EventType* event);
-    bool HandleControlRepeat(EventType* event);
-    bool HandleSize(EventType* event);
+    bool HandleControlSelect(WXEVENTPTR event);
+    bool HandleControlRepeat(WXEVENTPTR event);
+    bool HandleSize(WXEVENTPTR event);
+
+    virtual WXWINHANDLE GetWinHandle() const;

 
 protected:
     // common part of all ctors
 
 protected:
     // common part of all ctors


@@ -102,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;
 


@@ -126,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_

-