define wxUSE_BOOKCTRL when wxUSE_NOTE/LIST/CHOICEBOOK are 0; also define it as as...

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

diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index 40749393fe973e6c9fd4e7dd40810c0594677438..ff7d21b46d9ec18f75dcb269d715473a632b3a39 100644 (file)
--- a/include/wx/palmos/window.h
+++ b/include/wx/palmos/window.h
@@ -16,10 +16,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // 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
 // [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


@@ -57,8 +53,9 @@ public:
                 const wxString& name = wxPanelNameStr);
 
     // implement base class pure virtuals
                 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();
 
     virtual void Raise();
     virtual void Lower();


@@ -211,11 +208,11 @@ public:
 
 protected:
     // the window handle
 
 protected:
     // the window handle

-    WinHandle m_handle;
-    FormType *FrameForm;
+    WXWINHANDLE m_handle;
+    WXFORMPTR FrameForm;

 
 

-    FormType *GetFormPtr();
-    void SetFormPtr(FormType *FormPtr);
+    WXFORMPTR GetFormPtr();
+    void SetFormPtr(WXFORMPTR FormPtr);

 
     // additional (Palm specific) flags
     bool                  m_mouseInWindow:1;
 
     // additional (Palm specific) flags
     bool                  m_mouseInWindow:1;