wxDisplay support for wxWinCE port.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36360 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index f4016689ec6f63f45f56c640985e5b4fc0d15892..e2d1ba212ab0058a168935a12985b87dbd7cb3d1 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -60,6 +60,7 @@ wxWinCE:
 - Native wxCheckListBox implementation.
 - All wxTopLevelWindows resizes accordingly to SIP visibility.
 - ::wxGetUserName() implemented.
 - Native wxCheckListBox implementation.
 - All wxTopLevelWindows resizes accordingly to SIP visibility.
 - ::wxGetUserName() implemented.

+- wxDisplay enumeration support.

 
 Unix:
 
 
 Unix:
 

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index e2d6e9509578dc379f88dca24284c69f7cbd3648..e1980514356580ef20311425e1fdd0f601984405 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -1076,9 +1076,6 @@
 #undef wxUSE_DRAG_AND_DROP
 #define wxUSE_DRAG_AND_DROP 0
 
 #undef wxUSE_DRAG_AND_DROP
 #define wxUSE_DRAG_AND_DROP 0
 

-#undef wxUSE_DYNAMIC_LOADER
-#define wxUSE_DYNAMIC_LOADER 0
-

 #undef wxUSE_FSVOLUME
 #define wxUSE_FSVOLUME 0
 
 #undef wxUSE_FSVOLUME
 #define wxUSE_FSVOLUME 0
 

diff --git a/samples/display/display.cpp b/samples/display/display.cpp
index 2a0b0bc08274a8d1d5a7e4dc27433c33b7a3bd12..603b14ae9b4fcf1c966e1701cbbd8ec8bf4df7cb 100644 (file)
--- a/samples/display/display.cpp
+++ b/samples/display/display.cpp
@@ -33,7 +33,7 @@
     #error "To compile this sample you must build the library with wxUSE_DISPLAY set to 1"
 #endif
 
     #error "To compile this sample you must build the library with wxUSE_DISPLAY set to 1"
 #endif
 

-#include "wx/notebook.h"
+#include "wx/bookctrl.h"

 
 #include "wx/display.h"
 
 
 #include "wx/display.h"
 


@@ -86,7 +86,7 @@ private:
     wxString VideoModeToText(const wxVideoMode& mode);
 
     // GUI controls
     wxString VideoModeToText(const wxVideoMode& mode);
 
     // GUI controls

-    wxNotebook *m_notebook;
+    wxBookCtrl *m_book;

 
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 
     // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()


@@ -109,13 +109,11 @@ public:
 enum
 {
     // menu items
 enum
 {
     // menu items

-    Display_Quit = 1,
-
-    Display_FromPoint,
+    Display_FromPoint = wxID_HIGHEST + 1,

     Display_FullScreen,
 
     // controls
     Display_FullScreen,
 
     // controls

-    Display_ChangeMode = 1000,
+    Display_ChangeMode,

     Display_ResetMode,
     Display_CurrentMode,
 
     Display_ResetMode,
     Display_CurrentMode,
 


@@ -123,6 +121,7 @@ enum
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac
     // (where it is special and put into the "Apple" menu)
     // it is important for the id corresponding to the "About" command to have
     // this standard value as otherwise it won't be handled properly under Mac
     // (where it is special and put into the "Apple" menu)

+    Display_Quit = wxID_EXIT,

     Display_About = wxID_ABOUT
 };
 
     Display_About = wxID_ABOUT
 };
 


@@ -229,13 +228,13 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
 
     wxPanel *panel = new wxPanel(this, wxID_ANY);
 
 
     wxPanel *panel = new wxPanel(this, wxID_ANY);
 

-    m_notebook = new wxNotebook(panel, wxID_ANY);
+    m_book = new wxBookCtrl(panel, wxID_ANY);

     const size_t count = wxDisplay::GetCount();
     for ( size_t nDpy = 0; nDpy < count; nDpy++ )
     {
         wxDisplay display(nDpy);
 
     const size_t count = wxDisplay::GetCount();
     for ( size_t nDpy = 0; nDpy < count; nDpy++ )
     {
         wxDisplay display(nDpy);
 

-        wxWindow *page = new wxPanel(m_notebook, wxID_ANY);
+        wxWindow *page = new wxPanel(m_book, wxID_ANY);

 
         // create 2 column flex grid sizer with growable 2nd column
         wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 10, 20);
 
         // create 2 column flex grid sizer with growable 2nd column
         wxFlexGridSizer *sizer = new wxFlexGridSizer(2, 10, 20);


@@ -290,13 +289,13 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size,
                       0, wxALL | wxCENTRE, 5);
         page->SetSizer(sizerTop);
 
                       0, wxALL | wxCENTRE, 5);
         page->SetSizer(sizerTop);
 

-        m_notebook->AddPage(page,
-                            wxString::Format(_T("Display %lu"),
-                                             (unsigned long)nDpy));
+        m_book->AddPage(page,
+                        wxString::Format(_T("Display %lu"),
+                                         (unsigned long)nDpy));

     }
 
     wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);
     }
 
     wxBoxSizer *sizer = new wxBoxSizer(wxHORIZONTAL);

-    sizer->Add(m_notebook, 1, wxEXPAND);
+    sizer->Add(m_book, 1, wxEXPAND);

     panel->SetSizer(sizer);
     sizer->Fit(this);
     sizer->SetSizeHints(this);
     panel->SetSizer(sizer);
     sizer->Fit(this);
     sizer->SetSizeHints(this);


@@ -352,7 +351,7 @@ void MyFrame::OnFullScreen(wxCommandEvent& event)
 
 void MyFrame::OnChangeMode(wxCommandEvent& event)
 {
 
 void MyFrame::OnChangeMode(wxCommandEvent& event)
 {

-    wxDisplay dpy(m_notebook->GetSelection());
+    wxDisplay dpy(m_book->GetSelection());

 
     // you wouldn't write this in real code, would you?
     if ( !dpy.ChangeMode(((MyVideoModeClientData *)
 
     // you wouldn't write this in real code, would you?
     if ( !dpy.ChangeMode(((MyVideoModeClientData *)


@@ -365,7 +364,7 @@ void MyFrame::OnChangeMode(wxCommandEvent& event)
 
 void MyFrame::OnResetMode(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnResetMode(wxCommandEvent& WXUNUSED(event))
 {

-    wxDisplay dpy(m_notebook->GetSelection());
+    wxDisplay dpy(m_book->GetSelection());

 
     dpy.ResetMode();
 }
 
     dpy.ResetMode();
 }


@@ -392,9 +391,9 @@ void MyFrame::OnLeftClick(wxMouseEvent& event)
 void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
 {
     // update the current mode text
 void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
 {
     // update the current mode text

-    for ( size_t n = 0; n < m_notebook->GetPageCount(); n++ )
+    for ( size_t n = 0; n < m_book->GetPageCount(); n++ )

     {
     {

-        wxStaticText *label = wxDynamicCast(m_notebook->GetPage(n)->
+        wxStaticText *label = wxDynamicCast(m_book->GetPage(n)->

                                                 FindWindow(Display_CurrentMode),
                                             wxStaticText);
         if ( label )
                                                 FindWindow(Display_CurrentMode),
                                             wxStaticText);
         if ( label )


@@ -406,4 +405,3 @@ void MyFrame::OnDisplayChanged(wxDisplayChangedEvent& event)
 
     event.Skip();
 }
 
     event.Skip();
 }

-

diff --git a/src/msw/display.cpp b/src/msw/display.cpp
index c0e4b959867de43a050167afffd3f74c78856a10..536bd14811cd5d130fb9fcf3b69381972c9c5954 100644 (file)
--- a/src/msw/display.cpp
+++ b/src/msw/display.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        display.cpp
+// Name:        src/msw/display.cpp

 // Purpose:     MSW Implementation of wxDisplay class
 // Author:      Royce Mitchell III
 // Modified by: VZ (resolutions enumeration/change support, DirectDraw, ...)
 // Purpose:     MSW Implementation of wxDisplay class
 // Author:      Royce Mitchell III
 // Modified by: VZ (resolutions enumeration/change support, DirectDraw, ...)

-//                 Ryan Norton (IsPrimary override)
+//              Ryan Norton (IsPrimary override)

 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     06/21/02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team


@@ -54,9 +54,11 @@
 
 // with mingw32, we must include windows.h first and it doesn't hurt with other
 // compilers
 
 // with mingw32, we must include windows.h first and it doesn't hurt with other
 // compilers

-#include <windows.h>
+#include "wx/msw/wrapwin.h"

 
 

-#include <multimon.h>
+#ifndef __WXWINCE__
+    #include <multimon.h>
+#endif // !__WXWINCE__

 
 #ifdef _MSC_VER
     #pragma warning(default:4706)
 
 #ifdef _MSC_VER
     #pragma warning(default:4706)


@@ -325,6 +327,7 @@ wxVideoMode ConvertToVideoMode(const DEVMODE& dm)
                        dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0);
 }
 
                        dm.dmDisplayFrequency > 1 ? dm.dmDisplayFrequency : 0);
 }
 

+#ifndef __WXWINCE__

 // emulation of ChangeDisplaySettingsEx() for Win95
 LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
                                             LPDEVMODE lpDevMode,
 // emulation of ChangeDisplaySettingsEx() for Win95
 LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
                                             LPDEVMODE lpDevMode,


@@ -334,6 +337,7 @@ LONG WINAPI ChangeDisplaySettingsExForWin95(LPCTSTR WXUNUSED(lpszDeviceName),
 {
     return ::ChangeDisplaySettings(lpDevMode, dwFlags);
 }
 {
     return ::ChangeDisplaySettings(lpDevMode, dwFlags);
 }

+#endif // !__WXWINCE__

 
 // ----------------------------------------------------------------------------
 // wxDisplayModule
 
 // ----------------------------------------------------------------------------
 // wxDisplayModule


@@ -381,7 +385,7 @@ size_t wxDisplayBase::GetCount()
     //RN: FIXME:  This is wrong - the display info array should reload after every call
     //to GetCount() - otherwise it will not be accurate.
     //The user can change the number of displays in display properties/settings
     //RN: FIXME:  This is wrong - the display info array should reload after every call
     //to GetCount() - otherwise it will not be accurate.
     //The user can change the number of displays in display properties/settings

-    //after GetCount or similar is called and really mess this up...  
+    //after GetCount or similar is called and really mess this up...

     //wxASSERT_MSG( gs_displays->GetCount() == (size_t)::GetSystemMetrics(SM_CMONITORS),
     //                _T("So how many displays does this system have?") );
 
     //wxASSERT_MSG( gs_displays->GetCount() == (size_t)::GetSystemMetrics(SM_CMONITORS),
     //                _T("So how many displays does this system have?") );
 


@@ -727,7 +731,11 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode)
 
         pDevMode = &dm;
 
 
         pDevMode = &dm;
 

+#ifdef __WXWINCE__
+        flags = 0;
+#else // !__WXWINCE__

         flags = CDS_FULLSCREEN;
         flags = CDS_FULLSCREEN;

+#endif // __WXWINCE__/!__WXWINCE__

     }
 
 
     }
 
 


@@ -746,12 +754,14 @@ bool wxDisplay::DoChangeModeWindows(const wxVideoMode& mode)
         }
         //else: huh, no user32.dll??
 
         }
         //else: huh, no user32.dll??
 

+#ifndef __WXWINCE__

         if ( !pfnChangeDisplaySettingsEx )
         {
             // we must be under Win95 and so there is no multiple monitors
             // support anyhow
             pfnChangeDisplaySettingsEx = ChangeDisplaySettingsExForWin95;
         }
         if ( !pfnChangeDisplaySettingsEx )
         {
             // we must be under Win95 and so there is no multiple monitors
             // support anyhow
             pfnChangeDisplaySettingsEx = ChangeDisplaySettingsExForWin95;
         }

+#endif // !__WXWINCE__

     }
 
     // do change the mode
     }
 
     // do change the mode