projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added wxRearrange{List,Ctrl,Dialog} and use it in wxHeaderCtrl and wxGrid to provide...
[wxWidgets.git]
/
include
/
wx
/
palmos
/
window.h
diff --git
a/include/wx/palmos/window.h
b/include/wx/palmos/window.h
index 40749393fe973e6c9fd4e7dd40810c0594677438..09c8d5dd9f8e08476b81ecfd23459eb0cc1b770f 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
@@
-31,7
+27,7
@@
// wxWindow declaration for Palm
// ---------------------------------------------------------------------------
// wxWindow declaration for Palm
// ---------------------------------------------------------------------------
-class WXDLL
EXPORT
wxWindowPalm : public wxWindowBase
+class WXDLL
IMPEXP_CORE
wxWindowPalm : public wxWindowBase
{
public:
wxWindowPalm() { Init(); }
{
public:
wxWindowPalm() { Init(); }
@@
-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();
@@
-76,8
+73,6
@@
public:
virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = NULL );
virtual void Update();
virtual void Refresh( bool eraseBackground = true,
const wxRect *rect = NULL );
virtual void Update();
- virtual void Freeze();
- virtual void Thaw();
virtual bool SetCursor( const wxCursor &cursor );
virtual bool SetFont( const wxFont &font );
virtual bool SetCursor( const wxCursor &cursor );
virtual bool SetFont( const wxFont &font );
@@
-135,8
+130,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
// --------------
@@
-211,11
+207,11
@@
public:
protected:
// the window handle
protected:
// the window handle
- W
inHandle m_handle
;
-
FormType *
FrameForm;
+ W
XHWND m_hWnd
;
+
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;
@@
-273,12
+269,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;
-
DECLARE_DYNAMIC_CLASS(wxWindowPalm)
DECLARE_NO_COPY_CLASS(wxWindowPalm)
DECLARE_EVENT_TABLE()
DECLARE_DYNAMIC_CLASS(wxWindowPalm)
DECLARE_NO_COPY_CLASS(wxWindowPalm)
DECLARE_EVENT_TABLE()