- wxWindow::GetClientSize( width, height );
- if (height)
- {
- if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
- if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
- };
-};
-
-void wxFrame::GtkOnSize( int width, int height )
-{
- if ((m_height == height) && (m_width == width) &&
- (m_sizeSet)) return;
- if (!m_mainWindow) return;
- if (!m_wxwindow) return;
-
- m_width = width;
- m_height = height;
-
- gtk_widget_set_usize( m_widget, width, height );
-
- int main_x = 0;
- int main_y = 0;
- int main_height = height;
- int main_width = width;
-
- // This emulates Windows behaviour:
- // The menu bar is part of the main window, but the status bar
- // is on the implementation side in the client area. The
- // function GetClientSize returns the size of the client area
- // minus the status bar height. Under wxGTK, the main window
- // is represented by m_mainWindow. The menubar is inserted
- // into m_mainWindow whereas the statusbar is insertes into
- // m_wxwindow just like any other window.
-
-// not really needed
- gtk_widget_set_usize( m_mainWindow, width, height );
+ wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+
+ wxWindow::GetClientSize( width, height );
+ if (height)
+ {
+ if (m_frameMenuBar) (*height) -= wxMENU_HEIGHT;
+ if (m_frameStatusBar) (*height) -= wxSTATUS_HEIGHT;
+ if (m_frameToolBar)
+ {
+ int y = 0;
+ m_frameToolBar->GetSize( (int *) NULL, &y );
+ (*height) -= y;
+ }
+ (*height) -= m_miniEdge*2 + m_miniTitle;
+ }
+ if (width)
+ {
+ (*width) -= m_miniEdge*2;
+ }
+}
+
+void wxFrame::DoSetClientSize( int width, int height )
+{
+ wxASSERT_MSG( (m_widget != NULL), "invalid frame" );
+
+ int h = height;
+ if (m_frameMenuBar) h += wxMENU_HEIGHT;
+ if (m_frameStatusBar) h += wxSTATUS_HEIGHT;
+ if (m_frameToolBar)
+ {
+ int y = 0;
+ m_frameToolBar->GetSize( (int *) NULL, &y );
+ h += y;
+ }
+ wxWindow::DoSetClientSize( width + m_miniEdge*2, h + m_miniEdge*2 + m_miniTitle );
+}
+
+void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
+{
+ // due to a bug in gtk, x,y are always 0
+ // m_x = x;
+ // m_y = y;
+
+ if (m_resizing) return;
+ m_resizing = TRUE;
+
+ if (!m_wxwindow) return;
+
+ m_width = width;
+ m_height = height;
+
+ /* check if size is in legal range */
+ if ((m_minWidth != -1) && (m_width < m_minWidth)) m_width = m_minWidth;
+ if ((m_minHeight != -1) && (m_height < m_minHeight)) m_height = m_minHeight;
+ if ((m_maxWidth != -1) && (m_width > m_maxWidth)) m_width = m_maxWidth;
+ if ((m_maxHeight != -1) && (m_height > m_maxHeight)) m_height = m_maxHeight;
+
+ /* this emulates the new wxMSW behaviour of placing all
+ * frame-subwindows (menu, toolbar..) on one native window
+ * this hurts in the eye, but I don't want to call SetSize()
+ * because I don't want to call any non-native functions here. */
+
+ if (m_frameMenuBar)
+ {
+ int xx = m_miniEdge;
+ int yy = m_miniEdge + m_miniTitle;
+ int ww = m_width - 2*m_miniEdge;
+ int hh = wxMENU_HEIGHT;
+ m_frameMenuBar->m_x = xx;
+ m_frameMenuBar->m_y = yy;
+ m_frameMenuBar->m_width = ww;
+ m_frameMenuBar->m_height = hh;
+
+ gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, xx, yy );
+ gtk_widget_set_usize( m_frameMenuBar->m_widget, ww, hh );
+ }
projects / wxWidgets.git / blobdiff