return updated wxFONT*_* values

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

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index f2f25a01099c3433e94a3c641fad420f803384e1..1298d9a5b1335ad4585716bd5b67233ce5b578cc 100644 (file)
--- a/src/palmos/window.cpp
+++ b/src/palmos/window.cpp
@@ -76,16 +76,13 @@
 #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
 // ---------------------------------------------------------------------------


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

-    m_handle = 0;
+    m_hWnd = 0;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -435,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;


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

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

     }
 }
 
     }
 }
 


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

-
+#endif // # __WXUNIVERSAL__

 #endif // wxUSE_HOTKEY
 #endif // wxUSE_HOTKEY