made more clear that GetItemRect() returns physical coords

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

diff --git a/src/palmos/notebook.cpp b/src/palmos/notebook.cpp
index 328b7fcd76ff79c1c5b7e1937a976168cfb4ab21..9b12131b453dc324846e9633b486e9d683e130d9 100644 (file)
--- a/src/palmos/notebook.cpp
+++ b/src/palmos/notebook.cpp
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        palmos/notebook.cpp
+// Name:        src/palmos/notebook.cpp

 // Purpose:     implementation of wxNotebook
 // Purpose:     implementation of wxNotebook

-// Author:      William Osborne
+// Author:      William Osborne - minimal working wxPalmOS port

 // Modified by:
 // Created:     10/13/04
 // Modified by:
 // Created:     10/13/04

-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$

 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) William Osborne
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -27,32 +27,6 @@
   #include  "wx/string.h"
 #endif  // WX_PRECOMP
 
   #include  "wx/string.h"
 #endif  // WX_PRECOMP
 

-#include  "wx/log.h"
-#include  "wx/imaglist.h"
-#include  "wx/event.h"
-#include  "wx/control.h"
-#include  "wx/notebook.h"
-#include  "wx/app.h"
-
-#include  "wx/palmos/private.h"
-
-#include "wx/palmos/winundef.h"
-
-#if wxUSE_UXTHEME
-#include "wx/palmos/uxtheme.h"
-
-#include "wx/radiobut.h"
-#include "wx/radiobox.h"
-#include "wx/checkbox.h"
-#include "wx/bmpbuttn.h"
-#include "wx/statline.h"
-#include "wx/statbox.h"
-#include "wx/stattext.h"
-#include "wx/slider.h"
-#include "wx/scrolwin.h"
-#include "wx/panel.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -60,26 +34,6 @@
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 
 // check that the page index is valid
 #define IS_VALID_PAGE(nPage) ((nPage) < GetPageCount())
 

-// hide the ugly cast
-#define m_hwnd    (HWND)GetHWND()
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// This is a work-around for missing defines in gcc-2.95 headers
-#ifndef TCS_RIGHT
-    #define TCS_RIGHT       0x0002
-#endif
-
-#ifndef TCS_VERTICAL
-    #define TCS_VERTICAL    0x0080
-#endif
-
-#ifndef TCS_BOTTOM
-    #define TCS_BOTTOM      TCS_RIGHT
-#endif
-

 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event table
 // ----------------------------------------------------------------------------


@@ -111,7 +65,7 @@ wxBEGIN_FLAGS( wxNotebookStyle )
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)
     wxFLAGS_MEMBER(wxBORDER_RAISED)
     wxFLAGS_MEMBER(wxBORDER_STATIC)
     wxFLAGS_MEMBER(wxBORDER_NONE)

-    
+

     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)
     // old style border flags
     wxFLAGS_MEMBER(wxSIMPLE_BORDER)
     wxFLAGS_MEMBER(wxSUNKEN_BORDER)


@@ -158,7 +112,7 @@ wxEND_PROPERTIES_TABLE()
 wxBEGIN_HANDLERS_TABLE(wxNotebook)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxNotebook)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle) 
+wxCONSTRUCTOR_5( wxNotebook , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle)

 
 
 wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)
 
 
 wxBEGIN_PROPERTIES_TABLE(wxNotebookPageInfo)


@@ -171,7 +125,7 @@ wxEND_PROPERTIES_TABLE()
 wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo)
 wxEND_HANDLERS_TABLE()
 
 wxBEGIN_HANDLERS_TABLE(wxNotebookPageInfo)
 wxEND_HANDLERS_TABLE()
 

-wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId ) 
+wxCONSTRUCTOR_4( wxNotebookPageInfo , wxNotebookPage* , Page , wxString , Text , bool , Selected , int , ImageId )

 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)
 
 #else
 IMPLEMENT_DYNAMIC_CLASS(wxNotebook, wxControl)


@@ -225,23 +179,18 @@ bool wxNotebook::Create(wxWindow *parent,
     return false;
 }
 
     return false;
 }
 

-WXDWORD wxNotebook::MSWGetStyle(long style, WXDWORD *exstyle) const
-{
-    return 0;
-}
-

 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 
 size_t wxNotebook::GetPageCount() const
 {
 // ----------------------------------------------------------------------------
 // wxNotebook accessors
 // ----------------------------------------------------------------------------
 
 size_t wxNotebook::GetPageCount() const
 {

-  return 0;
+    return 0;

 }
 
 int wxNotebook::GetRowCount() const
 {
 }
 
 int wxNotebook::GetRowCount() const
 {

-  return 0;
+    return 0;

 }
 
 int wxNotebook::SetSelection(size_t nPage)
 }
 
 int wxNotebook::SetSelection(size_t nPage)


@@ -256,14 +205,12 @@ bool wxNotebook::SetPageText(size_t nPage, const wxString& strText)
 
 wxString wxNotebook::GetPageText(size_t nPage) const
 {
 
 wxString wxNotebook::GetPageText(size_t nPage) const
 {

-  wxString str;
-
-  return str;
+    return wxEmptyString;

 }
 
 int wxNotebook::GetPageImage(size_t nPage) const
 {
 }
 
 int wxNotebook::GetPageImage(size_t nPage) const
 {

-  return -1;
+    return -1;

 }
 
 bool wxNotebook::SetPageImage(size_t nPage, int nImage)
 }
 
 bool wxNotebook::SetPageImage(size_t nPage, int nImage)


@@ -313,7 +260,7 @@ wxNotebookPage *wxNotebook::DoRemovePage(size_t nPage)
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {
 // remove all pages
 bool wxNotebook::DeleteAllPages()
 {

-  return true;
+    return true;

 }
 
 // same as AddPage() but does it at given position
 }
 
 // same as AddPage() but does it at given position


@@ -344,11 +291,6 @@ void wxNotebook::OnSelChange(wxNotebookEvent& event)
 {
 }
 
 {
 }
 

-bool wxNotebook::MSWTranslateMessage(WXMSG *wxmsg)
-{
-    return false;
-}
-

 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {
 }
 void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
 {
 }


@@ -372,41 +314,4 @@ bool wxNotebook::DoPhase(int WXUNUSED(nPhase))
 
 #endif // wxUSE_CONSTRAINTS
 
 
 #endif // wxUSE_CONSTRAINTS
 

-// ----------------------------------------------------------------------------
-// wxNotebook Windows message handlers
-// ----------------------------------------------------------------------------
-
-bool wxNotebook::MSWOnScroll(int orientation, WXWORD nSBCode,
-                             WXWORD pos, WXHWND control)
-{
-    return false;
-}
-
-bool wxNotebook::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM* result)
-{
-  return false;
-}
-
-// Windows only: attempts to get colour for UX theme page background
-wxColour wxNotebook::GetThemeBackgroundColour()
-{
-    return wxColour;
-}
-
-// Windows only: attempts to apply the UX theme page background to this page
-#if wxUSE_UXTHEME
-void wxNotebook::ApplyThemeBackground(wxWindow* window, const wxColour& colour)
-#else
-void wxNotebook::ApplyThemeBackground(wxWindow*, const wxColour&)
-#endif
-{
-}
-
-#if wxUSE_UXTHEME
-WXLRESULT wxNotebook::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
-{
-    return 0;
-}
-#endif // #if wxUSE_UXTHEME
-

 #endif // wxUSE_NOTEBOOK
 #endif // wxUSE_NOTEBOOK