Add support for IEC and SI size units to wxFileName::GetHumanReadableSize().

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

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index b46aad8784b9bbe46bda232e9d739475b51642ff..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


@@ -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,22 +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
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 

-#if wxUSE_MENUS_NATIVE
-wxMenu *wxCurrentPopupMenu = NULL;
-#endif // wxUSE_MENUS_NATIVE
-

 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------


@@ -238,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_handle = 0;
+    m_hWnd = 0;

 }
 
 // Destructor
 }
 
 // Destructor


@@ -272,13 +272,13 @@ bool wxWindowPalm::Create(wxWindow *parent,
     return true;
 }
 
     return true;
 }
 

-FormType *wxWindowPalm::GetFormPtr()
+WXFORMPTR wxWindowPalm::GetFormPtr()

 {
     return FrameForm;
 }
 {
     return FrameForm;
 }

-void wxWindowPalm::SetFormPtr(FormType *FormPtr)
+void wxWindowPalm::SetFormPtr(WXFORMPTR FormPtr)

 {
 {

-    FrameForm=FormPtr;
+    FrameForm = FormPtr;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -319,11 +319,11 @@ void wxWindowPalm::Lower()
 {
 }
 
 {
 }
 

-void wxWindowPalm::SetTitle( const wxString& title)
+void wxWindowPalm::SetLabel( const wxString& WXUNUSED(label))

 {
 }
 
 {
 }
 

-wxString wxWindowPalm::GetTitle() const
+wxString wxWindowPalm::GetLabel() const

 {
     return wxEmptyString;
 }
 {
     return wxEmptyString;
 }


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

     if(handle)
     {
     if(handle)
     {

+#ifdef __WXPALMOS6__

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

-            dirtyRect.topLeft.x = rect->GetX();
-            dirtyRect.topLeft.y = rect->GetY();
-            dirtyRect.extent.x = rect->GetWidth();
-            dirtyRect.extent.y = rect->GetHeight();
+            dirtyRect.topLeft.x = rect->GetX() - 1;
+            dirtyRect.topLeft.y = rect->GetY() - 1;
+            dirtyRect.extent.x = rect->GetWidth() + 1;
+            dirtyRect.extent.y = rect->GetHeight() + 1;

             WinInvalidateRect(handle, &dirtyRect);
         }
         else
         {
             WinInvalidateWindow(handle);
         }
             WinInvalidateRect(handle, &dirtyRect);
         }
         else
         {
             WinInvalidateWindow(handle);
         }

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

     }
 }
 
     }
 }
 


@@ -510,6 +507,10 @@ void wxWindowPalm::DoGetClientSize(int *x, int *y) const
 
 void wxWindowPalm::DoGetPosition(int *x, int *y) const
 {
 
 void wxWindowPalm::DoGetPosition(int *x, int *y) const
 {

+    if(x)
+        *x = 0;
+    if(y)
+        *y = 0;

 }
 
 void wxWindowPalm::DoScreenToClient(int *x, int *y) const
 }
 
 void wxWindowPalm::DoScreenToClient(int *x, int *y) const


@@ -609,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

 {
 }
 
 {
 }
 


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

-
+#endif // # __WXUNIVERSAL__

 #endif // wxUSE_HOTKEY
 #endif // wxUSE_HOTKEY

-
-