From 8febdd39057cf2b4984561cc2f55acc9a0d07aca Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sat, 5 Feb 2000 17:56:26 +0000
Subject: [PATCH]   Fixed status bar probs,   Compilation fixes.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5856 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/latex/wx/classes.tex | 2 +-
 include/wx/gtk/frame.h    | 2 ++
 include/wx/gtk1/frame.h   | 2 ++
 src/generic/grid.cpp      | 1 +
 src/gtk/frame.cpp         | 7 +++++++
 src/gtk1/frame.cpp        | 7 +++++++
 6 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index d0da3dde40..a3bd2f3350 100644
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -211,7 +211,6 @@
 \input sashevt.tex
 \input sashlayw.tex
 \input sashwin.tex
-\input sbsizer.tex
 \input screendc.tex
 \input scrolbar.tex
 \input scrlwevt.tex
@@ -230,6 +229,7 @@
 \input splitter.tex
 \input statbmp.tex
 \input statbox.tex
+\input sbsizer.tex
 \input statline.tex
 \input stattext.tex
 \input statusbr.tex
diff --git a/include/wx/gtk/frame.h b/include/wx/gtk/frame.h
index 210aa7b612..582554c7ef 100644
--- a/include/wx/gtk/frame.h
+++ b/include/wx/gtk/frame.h
@@ -72,6 +72,8 @@ public:
     virtual void SetMenuBar( wxMenuBar *menuBar );
 
 #if wxUSE_STATUSBAR
+    virtual void PositionStatusBar();
+
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
                                          wxWindowID id = 0,
diff --git a/include/wx/gtk1/frame.h b/include/wx/gtk1/frame.h
index 210aa7b612..582554c7ef 100644
--- a/include/wx/gtk1/frame.h
+++ b/include/wx/gtk1/frame.h
@@ -72,6 +72,8 @@ public:
     virtual void SetMenuBar( wxMenuBar *menuBar );
 
 #if wxUSE_STATUSBAR
+    virtual void PositionStatusBar();
+
     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
                                          wxWindowID id = 0,
diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 7b119c6572..ed983aadc6 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2447,6 +2447,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     event.Skip();
                 }
+                break;
 
             case WXK_RETURN:
                 if ( event.ControlDown() )
diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 90a7b955cd..cf54c400db 100644
--- a/src/gtk/frame.cpp
+++ b/src/gtk/frame.cpp
@@ -985,6 +985,13 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 
+void wxFrame::PositionStatusBar()
+{
+    if ( !m_frameStatusBar )
+        return;
+
+    m_sizeSet = FALSE;
+}
 #endif // wxUSE_STATUSBAR
 
 // ----------------------------------------------------------------------------
diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 90a7b955cd..cf54c400db 100644
--- a/src/gtk1/frame.cpp
+++ b/src/gtk1/frame.cpp
@@ -985,6 +985,13 @@ wxStatusBar* wxFrame::CreateStatusBar(int number,
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 
+void wxFrame::PositionStatusBar()
+{
+    if ( !m_frameStatusBar )
+        return;
+
+    m_sizeSet = FALSE;
+}
 #endif // wxUSE_STATUSBAR
 
 // ----------------------------------------------------------------------------
-- 
2.50.0

