Just a teeny change -- addition of wxFrame::IsMaximized. For wxMDIChildFrame

in wxGTK, is probably always TRUE (always size of client area).

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

diff --git a/include/wx/motif/frame.h b/include/wx/motif/frame.h
index 945ecbc5a8c40e2f5ca43b82b97cee257c853f77..152e8132d6301beada99182ca235a8b58568c57e 100644 (file)
--- a/include/wx/motif/frame.h
+++ b/include/wx/motif/frame.h
@@ -143,6 +143,10 @@ public:
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 

+  // Is the frame maximized? Returns FALSE under Motif (but TRUE for
+  // wxMDIChildFrame due to the tabbed implementation).
+  virtual bool IsMaximized(void) const ;
+

   virtual void Maximize(bool maximize);
 
   // Responds to colour changes
   virtual void Maximize(bool maximize);
 
   // Responds to colour changes

diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h
index 74b483d5fa85b6970dc7354ccff383b265ccf4b3..557f0044db8c1e889beb116180199115d41beba6 100644 (file)
--- a/include/wx/motif/mdi.h
+++ b/include/wx/motif/mdi.h
@@ -180,6 +180,10 @@ public:
   virtual void Activate();
   virtual bool IsIconized() const ;
 
   virtual void Activate();
   virtual bool IsIconized() const ;
 

+  // Is the frame maximized? Returns TRUE for
+  // wxMDIChildFrame due to the tabbed implementation.
+  virtual bool IsMaximized(void) const ;
+

   bool Show(bool show);
 
   inline WXWidget GetMainWidget() const { return m_mainWidget; };
   bool Show(bool show);
 
   inline WXWidget GetMainWidget() const { return m_mainWidget; };

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index b9bfa8580b65b7a95cb3e0bd61842002d0fa6ed3..1c191305d8424093c26f0265d7b8c48def0666c2 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -138,6 +138,9 @@ public:
 
   virtual bool IsIconized(void) const ;
 
 
   virtual bool IsIconized(void) const ;
 

+  // Is it maximized?
+  virtual bool IsMaximized(void) const ;
+

   // Compatibility
   inline bool Iconized(void) const { return IsIconized(); }
 
   // Compatibility
   inline bool Iconized(void) const { return IsIconized(); }
 

diff --git a/include/wx/stubs/frame.h b/include/wx/stubs/frame.h
index fcd8689e5627a941ba5bc121c8e9021aea605df7..c01336217509ba2e0d85c1f84a71aa8084b19f82 100644 (file)
--- a/include/wx/stubs/frame.h
+++ b/include/wx/stubs/frame.h
@@ -128,6 +128,9 @@ public:
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 
   // Compatibility
   inline bool Iconized() const { return IsIconized(); }
 

+  // Is the frame maximized?
+  virtual bool IsMaximized(void) const ;
+

   virtual void Maximize(bool maximize);
 
   // Responds to colour changes
   virtual void Maximize(bool maximize);
 
   // Responds to colour changes

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index d540ec4a9c5c2754e4bbae966614d573fca6e12b..d018baa2a250d7d1de6c90d74546d25559732deb 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -534,6 +534,13 @@ bool wxFrame::IsIconized() const
   return iconic;
 }
 
   return iconic;
 }
 

+// Is it maximized?
+bool wxFrame::IsMaximized(void) const
+{
+    // No maximizing in Motif (?)
+    return FALSE;
+}
+

 void wxFrame::SetTitle(const wxString& title)
 {
   if (title == m_title)
 void wxFrame::SetTitle(const wxString& title)
 {
   if (title == m_title)

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index a2076eaf310dd9113073d11494e2b4f6f0f05dcf..a5f9b7cc555db303728c2f762822c7545ea9e799 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -572,6 +572,13 @@ bool wxMDIChildFrame::IsIconized() const
     return FALSE;
 }
 
     return FALSE;
 }
 

+// Is it maximized? Always maximized under Motif, using the
+// tabbed MDI implementation.
+bool wxMDIChildFrame::IsMaximized(void) const
+{
+    return TRUE;
+}
+

 void wxMDIChildFrame::Restore()
 {
     // TODO
 void wxMDIChildFrame::Restore()
 {
     // TODO

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 70feafee9398637fcca994fb916987d45b715d1e..8759c68272c8d6be89a074f2a4b85665c4314a58 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -331,6 +331,12 @@ bool wxFrame::IsIconized(void) const
   return m_iconized;
 }
 
   return m_iconized;
 }
 

+// Is it maximized?
+bool wxFrame::IsMaximized(void) const
+{
+    return (::IsZoomed((HWND) GetHWND()) != 0) ;
+}
+

 void wxFrame::SetTitle(const wxString& title)
 {
   SetWindowText((HWND) GetHWND(), (const char *)title);
 void wxFrame::SetTitle(const wxString& title)
 {
   SetWindowText((HWND) GetHWND(), (const char *)title);

diff --git a/src/stubs/frame.cpp b/src/stubs/frame.cpp
index 84555cbf01d752668b17633f5402a833943a0ece..1e8c9e9ae5fbca33a987c67e08ca267a942d9ea0 100644 (file)
--- a/src/stubs/frame.cpp
+++ b/src/stubs/frame.cpp
@@ -163,6 +163,13 @@ bool wxFrame::IsIconized() const
     return FALSE;
 }
 
     return FALSE;
 }
 

+// Is the frame maximized?
+bool wxFrame::IsMaximized(void) const
+{
+    // TODO
+    return FALSE;
+}
+

 void wxFrame::SetTitle(const wxString& title)
 {
     // TODO
 void wxFrame::SetTitle(const wxString& title)
 {
     // TODO