projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleaning up common OSX code
[wxWidgets.git]
/
src
/
palmos
/
window.cpp
diff --git
a/src/palmos/window.cpp
b/src/palmos/window.cpp
index 91ca0184d8d2d93ac6e50d9622e1582031c3f4d7..1298d9a5b1335ad4585716bd5b67233ce5b578cc 100644
(file)
--- a/
src/palmos/window.cpp
+++ b/
src/palmos/window.cpp
@@
-1,5
+1,5
@@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Name: src/palmos/window
s
.cpp
+// Name: src/palmos/window.cpp
// Purpose: wxWindow
// Author: William Osborne - minimal working wxPalmOS port
// Modified by: Wlodzimierz ABX Skiba - more than minimal functionality
// Purpose: wxWindow
// Author: William Osborne - minimal working wxPalmOS port
// Modified by: Wlodzimierz ABX Skiba - more than minimal functionality
@@
-17,10
+17,6
@@
// headers
// ---------------------------------------------------------------------------
// headers
// ---------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "window.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
@@
-28,10
+24,10
@@
#pragma hdrstop
#endif
#pragma hdrstop
#endif
+#include "wx/window.h"
+
#ifndef WX_PRECOMP
#ifndef WX_PRECOMP
- #include "wx/window.h"
#include "wx/accel.h"
#include "wx/accel.h"
- #include "wx/setup.h"
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
#include "wx/menu.h"
#include "wx/dc.h"
#include "wx/dcclient.h"
@@
-46,14
+42,17
@@
#include "wx/msgdlg.h"
#include "wx/settings.h"
#include "wx/statbox.h"
#include "wx/msgdlg.h"
#include "wx/settings.h"
#include "wx/statbox.h"
+ #include "wx/intl.h"
+ #include "wx/log.h"
+ #include "wx/textctrl.h"
+ #include "wx/menuitem.h"
+ #include "wx/module.h"
#endif
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
#include "wx/ownerdrw.h"
#endif
#endif
#if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
#include "wx/ownerdrw.h"
#endif
-#include "wx/module.h"
-
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
#if wxUSE_DRAG_AND_DROP
#include "wx/dnd.h"
#endif
@@
-62,9
+61,6
@@
#include "wx/access.h"
#endif
#include "wx/access.h"
#endif
-#include "wx/menuitem.h"
-#include "wx/log.h"
-
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif
#if wxUSE_TOOLTIPS
#include "wx/tooltip.h"
#endif
@@
-77,24
+73,16
@@
#include "wx/spinctrl.h"
#endif // wxUSE_SPINCTRL
#include "wx/spinctrl.h"
#endif // wxUSE_SPINCTRL
-#include "wx/intl.h"
-#include "wx/log.h"
-
-#include "wx/textctrl.h"
#include "wx/notebook.h"
#include "wx/listctrl.h"
#include "wx/notebook.h"
#include "wx/listctrl.h"
-#include "wx/window.h"
+#ifndef __WXUNIVERSAL__
#include <Window.h>
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
#include <Window.h>
// ---------------------------------------------------------------------------
// global variables
// ---------------------------------------------------------------------------
-#if wxUSE_MENUS_NATIVE
-wxMenu *wxCurrentPopupMenu = NULL;
-#endif // wxUSE_MENUS_NATIVE
-
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
// private functions
// ---------------------------------------------------------------------------
@@
-240,13
+228,23
@@
wxWindow *wxWindowPalm::FindItemByWinHandle(WXWINHANDLE handle, bool controlOnly
return NULL;
}
return NULL;
}
+bool wxGetKeyState(wxKeyCode key)
+{
+ wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+ WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
+
+ // TODO
+
+ return false;
+}
+
// ----------------------------------------------------------------------------
// constructors and such
// ----------------------------------------------------------------------------
void wxWindowPalm::Init()
{
// ----------------------------------------------------------------------------
// constructors and such
// ----------------------------------------------------------------------------
void wxWindowPalm::Init()
{
- m_h
andle
= 0;
+ m_h
Wnd
= 0;
}
// Destructor
}
// Destructor
@@
-321,11
+319,11
@@
void wxWindowPalm::Lower()
{
}
{
}
-void wxWindowPalm::Set
Title( const wxString& title
)
+void wxWindowPalm::Set
Label( const wxString& WXUNUSED(label)
)
{
}
{
}
-wxString wxWindowPalm::Get
Title
() const
+wxString wxWindowPalm::Get
Label
() const
{
return wxEmptyString;
}
{
return wxEmptyString;
}
@@
-434,19
+432,12
@@
bool wxWindowPalm::Reparent(wxWindowBase *parent)
return false;
}
return false;
}
-void wxWindowPalm::Freeze()
-{
-}
-
-void wxWindowPalm::Thaw()
-{
-}
-
void wxWindowPalm::Refresh(bool eraseBack, const wxRect *rect)
{
void wxWindowPalm::Refresh(bool eraseBack, const wxRect *rect)
{
- WinHandle handle = (WinHandle)Get
WinHandle
();
+ WinHandle handle = (WinHandle)Get
HWND
();
if(handle)
{
if(handle)
{
+#ifdef __WXPALMOS6__
if(rect)
{
RectangleType dirtyRect;
if(rect)
{
RectangleType dirtyRect;
@@
-460,6
+451,10
@@
void wxWindowPalm::Refresh(bool eraseBack, const wxRect *rect)
{
WinInvalidateWindow(handle);
}
{
WinInvalidateWindow(handle);
}
+#else // __WXPALMOS5__
+ WinSetActiveWindow (handle);
+#endif
+
}
}
}
}
@@
-753,7
+748,5
@@
bool wxWindowPalm::UnregisterHotKey(int hotkeyId)
{
return false;
}
{
return false;
}
-
+#endif // # __WXUNIVERSAL__
#endif // wxUSE_HOTKEY
#endif // wxUSE_HOTKEY
-
-