fixed wxGTK1 compilation after wxDC changes (still doesn't work)

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

diff --git a/include/wx/palmos/window.h b/include/wx/palmos/window.h
index 698bf7a181ad914be99082776e869f9c6cc4510e..aeb2a5f9a96520a3aab37c1bb82e15b92d6f385e 100644 (file)
--- a/include/wx/palmos/window.h
+++ b/include/wx/palmos/window.h
@@ -53,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();


@@ -131,8 +132,9 @@ public:
     // simple accessors
     // ----------------
 
     // simple accessors
     // ----------------
 

-    virtual WXWINHANDLE GetWinHandle() const { return m_handle; }
-    virtual WXWidget GetHandle() const { return GetWinHandle(); }
+    WXHWND GetHWND() const { return m_hWnd; }
+    void SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
+    virtual WXWidget GetHandle() const { return GetHWND(); }

 
     // event handlers
     // --------------
 
     // event handlers
     // --------------


@@ -207,7 +209,7 @@ public:
 
 protected:
     // the window handle
 
 protected:
     // the window handle

-    WXWINHANDLE m_handle;
+    WXHWND                m_hWnd;

     WXFORMPTR FrameForm;
 
     WXFORMPTR GetFormPtr();
     WXFORMPTR FrameForm;
 
     WXFORMPTR GetFormPtr();


@@ -269,9 +271,6 @@ private:
     bool HandleMoving(wxRect& rect);
     bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
 
     bool HandleMoving(wxRect& rect);
     bool HandleJoystickEvent(WXUINT msg, int x, int y, WXUINT flags);
 

-    // list of disabled children before last call to our Disable()
-    wxWindowList *m_childrenDisabled;
-

     // number of calls to Freeze() minus number of calls to Thaw()
     unsigned int m_frozenness;
 
     // number of calls to Freeze() minus number of calls to Thaw()
     unsigned int m_frozenness;