Rework the wxCusor ctor taking wx stock number to provide as many cursors as

[wxWidgets.git] / src / common / dpycmn.cpp

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index b30084f099d260005b683121eab0258b1b51bf61..e728d1b88597aafd1806921cb4db835fce9474f0 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -27,12 +27,11 @@
 #ifndef WX_PRECOMP
     #include "wx/gdicmn.h"
     #include "wx/window.h"
 #ifndef WX_PRECOMP
     #include "wx/gdicmn.h"
     #include "wx/window.h"

+    #include "wx/module.h"

 #endif //WX_PRECOMP
 
 #include "wx/display.h"
 #include "wx/display_impl.h"
 #endif //WX_PRECOMP
 
 #include "wx/display.h"
 #include "wx/display_impl.h"

-#include "wx/module.h"
-#include "wx/gdicmn.h"           // for wxDisplaySize()

 
 #if wxUSE_DISPLAY
 
 
 #if wxUSE_DISPLAY
 


@@ -68,6 +67,8 @@ public:
         return r;
     }
 
         return r;
     }
 

+    virtual wxRect GetClientArea() const { return wxGetClientDisplayRect(); }
+

     virtual wxString GetName() const { return wxString(); }
 
 #if wxUSE_DISPLAY
     virtual wxString GetName() const { return wxString(); }
 
 #if wxUSE_DISPLAY


@@ -117,7 +118,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxDisplayModule, wxModule)
 // ctor/dtor
 // ----------------------------------------------------------------------------
 
 // ctor/dtor
 // ----------------------------------------------------------------------------
 

-wxDisplay::wxDisplay(size_t n)
+wxDisplay::wxDisplay(unsigned n)

 {
     wxASSERT_MSG( n < GetCount(),
                     wxT("An invalid index was passed to wxDisplay") );
 {
     wxASSERT_MSG( n < GetCount(),
                     wxT("An invalid index was passed to wxDisplay") );


@@ -134,7 +135,7 @@ wxDisplay::~wxDisplay()
 // static functions forwarded to wxDisplayFactory
 // ----------------------------------------------------------------------------
 
 // static functions forwarded to wxDisplayFactory
 // ----------------------------------------------------------------------------
 

-/* static */ size_t wxDisplay::GetCount()
+/* static */ unsigned wxDisplay::GetCount()

 {
     return Factory().GetCount();
 }
 {
     return Factory().GetCount();
 }


@@ -144,7 +145,7 @@ wxDisplay::~wxDisplay()
     return Factory().GetFromPoint(pt);
 }
 
     return Factory().GetFromPoint(pt);
 }
 

-/* static */ int wxDisplay::GetFromWindow(wxWindow *window)
+/* static */ int wxDisplay::GetFromWindow(const wxWindow *window)

 {
     wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
 
 {
     wxCHECK_MSG( window, wxNOT_FOUND, _T("invalid window") );
 


@@ -162,6 +163,13 @@ wxRect wxDisplay::GetGeometry() const
     return m_impl->GetGeometry();
 }
 
     return m_impl->GetGeometry();
 }
 

+wxRect wxDisplay::GetClientArea() const
+{
+    wxCHECK_MSG( IsOk(), wxRect(), _T("invalid wxDisplay object") );
+
+    return m_impl->GetClientArea();
+}
+

 wxString wxDisplay::GetName() const
 {
     wxCHECK_MSG( IsOk(), wxString(), _T("invalid wxDisplay object") );
 wxString wxDisplay::GetName() const
 {
     wxCHECK_MSG( IsOk(), wxString(), _T("invalid wxDisplay object") );


@@ -227,7 +235,7 @@ bool wxDisplay::ChangeMode(const wxVideoMode& mode)
 // wxDisplayFactory implementation
 // ============================================================================
 
 // wxDisplayFactory implementation
 // ============================================================================
 

-int wxDisplayFactory::GetFromWindow(wxWindow *window)
+int wxDisplayFactory::GetFromWindow(const wxWindow *window)

 {
     // consider that the window belongs to the display containing its centre
     const wxRect r(window->GetRect());
 {
     // consider that the window belongs to the display containing its centre
     const wxRect r(window->GetRect());


@@ -239,7 +247,7 @@ int wxDisplayFactory::GetFromWindow(wxWindow *window)
 // ============================================================================
 
 /* static */
 // ============================================================================
 
 /* static */

-wxDisplayImpl *wxDisplayFactorySingle::CreateDisplay(size_t n)
+wxDisplayImpl *wxDisplayFactorySingle::CreateDisplay(unsigned n)

 {
     // we recognize the main display only
     return n != 0 ? NULL : new wxDisplayImplSingle;
 {
     // we recognize the main display only
     return n != 0 ? NULL : new wxDisplayImplSingle;


@@ -259,4 +267,3 @@ int wxDisplayFactorySingle::GetFromPoint(const wxPoint& pt)
     // the point is outside of the screen
     return wxNOT_FOUND;
 }
     // the point is outside of the screen
     return wxNOT_FOUND;
 }

-