Commited Bryan Petty's blind fix patch.

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

diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp
index 02a43e497a0069078e6c48565a475b34bc6ca860..2839a44221c91991e54b17d0c865851e1ea657d9 100644 (file)
--- a/src/palmos/window.cpp
+++ b/src/palmos/window.cpp
@@ -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,6 +42,10 @@
     #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"

 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)
 #endif
 
 #if wxUSE_OWNER_DRAWN && !defined(__WXUNIVERSAL__)


@@ -62,9 +62,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,13 +74,10 @@
     #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"
+
+#include <Window.h>

 
 // ---------------------------------------------------------------------------
 // global variables
 
 // ---------------------------------------------------------------------------
 // global variables


@@ -238,6 +232,16 @@ 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constructors and such
 // ----------------------------------------------------------------------------


@@ -272,13 +276,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 +323,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;
 }


@@ -442,7 +446,7 @@ 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)GetWinHandle();

     if(handle)
     {
         if(rect)
     if(handle)
     {
         if(rect)


@@ -753,5 +757,3 @@ bool wxWindowPalm::UnregisterHotKey(int hotkeyId)
 }
 
 #endif // wxUSE_HOTKEY
 }
 
 #endif // wxUSE_HOTKEY

-
-