X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db101bd35296e100d490d3c033c0fdee32747e85..97d216abcb491a6cf440a0bd97dbf32a5cf7fded:/src/palmos/window.cpp diff --git a/src/palmos/window.cpp b/src/palmos/window.cpp index 39bff56d6a..5eba9aed6a 100644 --- a/src/palmos/window.cpp +++ b/src/palmos/window.cpp @@ -2,10 +2,10 @@ // Name: src/palmos/windows.cpp // Purpose: wxWindow // Author: William Osborne - minimal working wxPalmOS port -// Modified by: +// Modified by: Wlodzimierz ABX Skiba - more than minimal functionality // Created: 10/13/04 // RCS-ID: $Id$ -// Copyright: (c) William Osborne +// Copyright: (c) William Osborne, Wlodzimierz Skiba // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -83,10 +83,7 @@ #include "wx/textctrl.h" #include "wx/notebook.h" #include "wx/listctrl.h" - -#include - -#include "wx/palmos/window.h" +#include "wx/window.h" // --------------------------------------------------------------------------- // global variables @@ -96,12 +93,6 @@ wxMenu *wxCurrentPopupMenu = NULL; #endif // wxUSE_MENUS_NATIVE -#ifdef __WXWINCE__ -extern wxChar *wxCanvasClassName; -#else -extern const wxChar *wxCanvasClassName; -#endif - // true if we had already created the std colour map, used by // wxGetStdColourMap() and wxWindow::OnSysColourChanged() (FIXME-MT) static bool gs_hasStdCmap = false; @@ -278,7 +269,16 @@ bool wxWindowPalm::Create(wxWindow *parent, long style, const wxString& name) { - return false; + wxCHECK_MSG( parent, false, wxT("can't create wxWindow without parent") ); + + if ( !CreateBase(parent, id, pos, size, style, wxDefaultValidator, name) ) + return false; + + parent->AddChild(this); + + InheritAttributes(); + + return true; } FormType *wxWindowPalm::GetFormPtr() @@ -706,37 +706,6 @@ bool wxWindowPalm::PalmCreate(const wxChar *wclass, // Palm message handlers // =========================================================================== -// --------------------------------------------------------------------------- -// WM_NOTIFY -// --------------------------------------------------------------------------- - -#ifdef __WIN95__ - -bool wxWindowPalm::HandleNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) -{ - return false; -} - -#if wxUSE_TOOLTIPS - -bool wxWindowPalm::HandleTooltipNotify(WXUINT code, - WXLPARAM lParam, - const wxString& ttip) -{ - return false; -} - -#endif // wxUSE_TOOLTIPS - -bool wxWindowPalm::PalmOnNotify(int WXUNUSED(idCtrl), - WXLPARAM lParam, - WXLPARAM* WXUNUSED(result)) -{ - return false; -} - -#endif // __WIN95__ - // --------------------------------------------------------------------------- // end session messages // ---------------------------------------------------------------------------