Use _UNICODE instead of UNICODE in wx/msw/winundef.h.

[wxWidgets.git] / src / palmos / window.cpp

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index fdcf02cf3f93b81de4e02262980d2d53367c30fa..144ad5b1122b741c43a4dd85c3abc66d8865b2ac 100644 (file)
--- a/src/palmos/window.cpp
+++ b/src/palmos/window.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/palmos/windows.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


@@ -44,14 +44,15 @@
     #include "wx/statbox.h"
     #include "wx/intl.h"
     #include "wx/log.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


@@ -60,8 +61,6 @@
     #include "wx/access.h"
 #endif
 
     #include "wx/access.h"
 #endif
 

-#include "wx/menuitem.h"
-

 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif


@@ -74,20 +73,16 @@
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 
     #include "wx/spinctrl.h"
 #endif // wxUSE_SPINCTRL
 

-#include "wx/textctrl.h"

 #include "wx/notebook.h"
 #include "wx/listctrl.h"
 
 #include "wx/notebook.h"
 #include "wx/listctrl.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
 // ---------------------------------------------------------------------------


@@ -249,7 +244,7 @@ bool wxGetKeyState(wxKeyCode key)
 
 void wxWindowPalm::Init()
 {
 
 void wxWindowPalm::Init()
 {

-    m_handle = 0;
+    m_hWnd = 0;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -437,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)GetWinHandle();
+    WinHandle handle = (WinHandle)GetHWND();

     if(handle)
     {
     if(handle)
     {

+#ifdef __WXPALMOS6__

         if(rect)
         {
             RectangleType dirtyRect;
         if(rect)
         {
             RectangleType dirtyRect;


@@ -463,6 +451,10 @@ void wxWindowPalm::Refresh(bool eraseBack, const wxRect *rect)
         {
             WinInvalidateWindow(handle);
         }
         {
             WinInvalidateWindow(handle);
         }

+#else // __WXPALMOS5__
+        WinSetActiveWindow (handle);
+#endif
+

     }
 }
 
     }
 }
 


@@ -618,10 +610,11 @@ int wxWindowPalm::GetCharWidth() const
     return 0;
 }
 
     return 0;
 }
 

-void wxWindowPalm::GetTextExtent(const wxString& string,
-                             int *x, int *y,
-                             int *descent, int *externalLeading,
-                             const wxFont *theFont) const
+void wxWindowPalm::DoGetTextExtent(const wxString& string,
+                                   int *x, int *y,
+                                   int *descent,
+                                   int *externalLeading,
+                                   const wxFont *theFont) const

 {
 }
 
 {
 }
 


@@ -756,5 +749,5 @@ bool wxWindowPalm::UnregisterHotKey(int hotkeyId)
 {
     return false;
 }
 {
     return false;
 }

-
+#endif // # __WXUNIVERSAL__

 #endif // wxUSE_HOTKEY
 #endif // wxUSE_HOTKEY