don't use border styles for windows in wxUniversal

[wxWidgets.git] / include / wx / app.h

diff --git a/include/wx/app.h b/include/wx/app.h
index 8f631cccf22053799f447eb62dffa780696daf90..88258c10fe8e8e52a33af3cb761be468413608a9 100644 (file)
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -61,21 +61,21 @@ static const int wxPRINT_POSTSCRIPT = 2;
 #if wxUSE_GUI
 // VS: Fullscreen/framebuffer application needs to choose display mode prior
 //     to wxWindows initialization. This class holds information about display
-//     mode. An instance of it is returned by virtual wxApp::GetDisplayMode.
+//     mode. It is used by  wxApp::Set/GetDisplayMode.
 class WXDLLEXPORT wxDisplayModeInfo
 {
 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:
-    wxSize   m_size;
-    unsigned m_depth;
+    unsigned m_width, m_height, m_depth;
     bool     m_ok;
 };
 #endif
@@ -88,6 +88,7 @@ class WXDLLEXPORT wxAppBase : public wxEvtHandler
 {
 public:
     wxAppBase();
+    virtual ~wxAppBase();
 
     // the virtual functions which may/must be overridden in the derived class
     // -----------------------------------------------------------------------
@@ -279,10 +280,12 @@ public:
         // wxICON_XXX values
     virtual wxIcon GetStdIcon(int which) const = 0;
 
-        // get display mode to use. This is only used in framebuffer wxWin ports
-        // (such as wxMGL). This method is called early in wxWin initialization
-        // process and is supposed to be overriden in derived classes.
+        // Get display mode that is used use. This is only used in framebuffer wxWin ports
+        // (such as wxMGL).
     virtual wxDisplayModeInfo GetDisplayMode() const { return wxDisplayModeInfo(); }
+        // Set display mode to use. This is only used in framebuffer wxWin ports
+        // (such as wxMGL). This method should be called from wxApp:OnInitGui
+    virtual bool SetDisplayMode(const wxDisplayModeInfo& WXUNUSED(info)) { return TRUE; }
 
         // VZ: what does this do exactly?
     void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; }
@@ -324,11 +327,6 @@ public:
     static wxAppInitializerFunction GetInitializerFunction()
         { return m_appInitFn; }
 
-    // needed to avoid link errors
-#ifdef __DARWIN__
-    virtual ~wxAppBase() { }
-#endif
-
     // process all events in the wxPendingEvents list
     virtual void ProcessPendingEvents();
 
@@ -377,6 +375,8 @@ protected:
         #include "wx/mgl/app.h"
     #elif defined(__WXGTK__)
         #include "wx/gtk/app.h"
+    #elif defined(__WXX11__)
+        #include "wx/x11/app.h"
     #elif defined(__WXMAC__)
         #include "wx/mac/app.h"
     #elif defined(__WXPM__)