Merge in from trunk r64802 - r68625

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

diff --git a/src/palmos/nativdlg.cpp b/src/palmos/nativdlg.cpp
index 015967eb4466a988e66ea95c6ee558606c7833e2..cef2d03dbee9cd56573c9bc7da58c63ca3bf55ec 100644 (file)
--- a/src/palmos/nativdlg.cpp
+++ b/src/palmos/nativdlg.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        nativdlg.cpp
+// Name:        src/palmos/nativdlg.cpp
 // Purpose:     Native dialog loading code (part of wxWindow)
-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port
 // Modified by:
 // Created:     10/13/04
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -72,13 +68,13 @@ wxWindow* wxWindow::GetWindowChild(wxWindowID id)
 // create wxWin window from a native HWND
 // ---------------------------------------------------------------------------
 
-wxWindow* wxWindow::CreateWindowFromHWND(wxWindow* parent, WXHWND hWnd)
+wxWindow* wxWindow::CreateWindowFromWinHandle(wxWindow* parent, WXWINHANDLE handle)
 {
     return NULL;
 }
 
-// Make sure the window style (etc.) reflects the HWND style (roughly)
-void wxWindow::AdoptAttributesFromHWND(void)
+// Make sure the window style (etc.) reflects the WinHandle style (roughly)
+void wxWindow::AdoptAttributesFromWinHandle(void)
 {
 }