Fixed status bar probs,

  Compilation fixes.

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

diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index d0da3dde40492ee94212bae116f7452c1016db88..a3bd2f33500861cd2651bb2f5a43c6db2bb51743 100644 (file)
--- 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 sashevt.tex
 \input sashlayw.tex
 \input sashwin.tex

-\input sbsizer.tex

 \input screendc.tex
 \input scrolbar.tex
 \input scrlwevt.tex
 \input screendc.tex
 \input scrolbar.tex
 \input scrlwevt.tex


@@ -230,6 +229,7 @@
 \input splitter.tex
 \input statbmp.tex
 \input statbox.tex
 \input splitter.tex
 \input statbmp.tex
 \input statbox.tex

+\input sbsizer.tex

 \input statline.tex
 \input stattext.tex
 \input statusbr.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 210aa7b612a54cf92c1873dbcec92f242f0f6903..582554c7ef94ca82ecbabe1ad371a02c68cfcc0e 100644 (file)
--- 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 SetMenuBar( wxMenuBar *menuBar );
 
 #if wxUSE_STATUSBAR

+    virtual void PositionStatusBar();
+

     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
                                          wxWindowID id = 0,
     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 210aa7b612a54cf92c1873dbcec92f242f0f6903..582554c7ef94ca82ecbabe1ad371a02c68cfcc0e 100644 (file)
--- 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 SetMenuBar( wxMenuBar *menuBar );
 
 #if wxUSE_STATUSBAR

+    virtual void PositionStatusBar();
+

     virtual wxStatusBar* CreateStatusBar(int number = 1,
                                          long style = wxST_SIZEGRIP,
                                          wxWindowID id = 0,
     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 7b119c657207f6f381dca3a54c84a0a84c3f07ca..ed983aadc6d2152e8fb2c513d959187a60568e46 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -2447,6 +2447,7 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                 {
                     event.Skip();
                 }
                 {
                     event.Skip();
                 }

+                break;

 
             case WXK_RETURN:
                 if ( event.ControlDown() )
 
             case WXK_RETURN:
                 if ( event.ControlDown() )

diff --git a/src/gtk/frame.cpp b/src/gtk/frame.cpp
index 90a7b955cd71bbe5d36fe6f38604a4302011aa04..cf54c400dbe85b16d2ee619672f930d92f919baf 100644 (file)
--- 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 );
 }
 
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 

+void wxFrame::PositionStatusBar()
+{
+    if ( !m_frameStatusBar )
+        return;
+
+    m_sizeSet = FALSE;
+}

 #endif // wxUSE_STATUSBAR
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_STATUSBAR
 
 // ----------------------------------------------------------------------------

diff --git a/src/gtk1/frame.cpp b/src/gtk1/frame.cpp
index 90a7b955cd71bbe5d36fe6f38604a4302011aa04..cf54c400dbe85b16d2ee619672f930d92f919baf 100644 (file)
--- 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 );
 }
 
     return wxFrameBase::CreateStatusBar( number, style, id, name );
 }
 

+void wxFrame::PositionStatusBar()
+{
+    if ( !m_frameStatusBar )
+        return;
+
+    m_sizeSet = FALSE;
+}

 #endif // wxUSE_STATUSBAR
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_STATUSBAR
 
 // ----------------------------------------------------------------------------