more programmer-friendly wxApp::SetDisplayMode

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

diff --git a/include/wx/app.h b/include/wx/app.h
index fde92485c38da2338ca7ff47a3a22f9407922168..4e562c5968d153e35f84fc1a6e4262b78fd0ef9c 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -66,16 +66,16 @@ class WXDLLEXPORT wxDisplayModeInfo
 {
 public:
     wxDisplayModeInfo() : m_ok(FALSE) {}
 {
 public:
     wxDisplayModeInfo() : m_ok(FALSE) {}

-    wxDisplayModeInfo(const wxSize& size, unsigned depth) 
-        : m_size(size), m_depth(depth), m_ok(TRUE) {}
+    wxDisplayModeInfo(unsigned width, unsigned height, unsigned depth) 
+        : m_width(width), m_height(height), m_depth(depth), m_ok(TRUE) {}

     
     

-    const wxSize& GetScreenSize() const { return m_size; }
+    unsigned GetWidth() const { return m_width; }
+    unsigned GetHeight() const { return m_height; }

     unsigned GetDepth() const { return m_depth; }
     bool IsOk() const { return m_ok; }
 
 private:
     unsigned GetDepth() const { return m_depth; }
     bool IsOk() const { return m_ok; }
 
 private:

-    wxSize   m_size;
-    unsigned m_depth;
+    unsigned m_width, m_height, m_depth;

     bool     m_ok;
 };
 #endif
     bool     m_ok;
 };
 #endif

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 49c21fe4693de9d9a9eb7c003f9c412f90ddbbfa..ce42b0dd1fff6c405027dc07630e39fb3565114a 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -284,7 +284,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
             return FALSE;
         }
 
             return FALSE;
         }
 

-        if ( !SetDisplayMode(wxDisplayModeInfo(wxSize(w, h), bpp)) )
+        if ( !SetDisplayMode(wxDisplayModeInfo(w, h, bpp)) )

             return FALSE;
     }
 #endif
             return FALSE;
     }
 #endif