Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added wxMiniFrame

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1106 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-12-04 07:43:56 +00:00
parent d669c24159
commit b2b3ccc524
42 changed files with 1298 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gtk.inc
View File

@@ -95,6 +95,7 @@ LIB_CPP_SRC=\
gtk/listbox.cpp \
gtk/mdi.cpp \
gtk/menu.cpp \
gtk/minifram.cpp \
gtk/notebook.cpp \
gtk/palette.cpp \
gtk/pen.cpp \

74
src/gtk/frame.cpp
View File

@@ -108,6 +108,8 @@ wxFrame::wxFrame()
m_frameStatusBar = (wxStatusBar *) NULL;
m_frameToolBar = (wxToolBar *) NULL;
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
}
wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
@@ -118,6 +120,8 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
m_frameStatusBar = (wxStatusBar *) NULL;
m_frameToolBar = (wxToolBar *) NULL;
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
Create( parent, id, title, pos, size, style, name );
}
@@ -213,7 +217,7 @@ bool wxFrame::Destroy()
wxPoint wxFrame::GetClientAreaOrigin() const
{
wxPoint pt(0, 0);
wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle );
if (m_frameMenuBar)
{
int h = 0;
@@ -325,6 +329,11 @@ void wxFrame::GetClientSize( int *width, int *height ) const
m_frameToolBar->GetSize( (int *) NULL, &y );
(*height) -= y;
}
(*height) -= m_miniEdge*2 + m_miniTitle;
}
if (width)
{
(*width) -= m_miniEdge*2;
}
}
@@ -341,7 +350,7 @@ void wxFrame::SetClientSize( int const width, int const height )
m_frameToolBar->GetSize( (int *) NULL, &y );
h += y;
}
wxWindow::SetClientSize( width, h );
wxWindow::SetClientSize( width + m_miniEdge*2, h + m_miniEdge*2 + m_miniTitle );
}
void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -365,39 +374,57 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
gtk_widget_set_usize( m_widget, m_width, m_height );
// This emulates the new wxMSW behaviour
// this emulates the new wxMSW behaviour of placing all
// frame-subwindows (menu, toolbar..) on one native window
// OK, 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)
{
m_frameMenuBar->m_x = 1;
m_frameMenuBar->m_y = 1;
m_frameMenuBar->m_width = m_width-2;
m_frameMenuBar->m_height = wxMENU_HEIGHT-2;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, 1, 1 );
gtk_widget_set_usize( m_frameMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
int xx = 1 + m_miniEdge;
int yy = 1 + m_miniEdge + m_miniTitle;
int ww = m_width - 2 - 2*m_miniEdge;
int hh = wxMENU_HEIGHT-2;
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 );
}
if (m_frameToolBar)
{
int y = 0;
if (m_frameMenuBar) y = wxMENU_HEIGHT;
int h = m_frameToolBar->m_height;
int xx = 1 + m_miniEdge;
int yy = m_miniEdge + m_miniTitle;
if (m_frameMenuBar) yy += wxMENU_HEIGHT;
int ww = m_width -2 - 2*m_miniEdge;
int hh = m_frameToolBar->m_height;
m_frameToolBar->m_x = 2;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, 2, y );
gtk_widget_set_usize( m_frameToolBar->m_widget, m_width-3, h );
m_frameToolBar->m_x = xx;
m_frameToolBar->m_y = yy;
m_frameToolBar->m_height = hh;
m_frameToolBar->m_width = ww;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy );
gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
}
if (m_frameStatusBar)
{
// OK, 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.
m_frameStatusBar->m_x = 0;
m_frameStatusBar->m_y = m_height-wxSTATUS_HEIGHT;
m_frameStatusBar->m_width = m_width;
m_frameStatusBar->m_height = wxSTATUS_HEIGHT;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, 0, m_height-wxSTATUS_HEIGHT );
gtk_widget_set_usize( m_frameStatusBar->m_widget, m_width, wxSTATUS_HEIGHT );
int xx = 0 + m_miniEdge;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = wxSTATUS_HEIGHT;
m_frameStatusBar->m_x = xx;
m_frameStatusBar->m_y = yy;
m_frameStatusBar->m_width = ww;
m_frameStatusBar->m_height = hh;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
}
m_sizeSet = TRUE;
@@ -606,3 +633,4 @@ void wxFrame::SetIcon( const wxIcon &icon )
gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
}

153
src/gtk/minifram.cpp Normal file
View File

@@ -0,0 +1,153 @@
/////////////////////////////////////////////////////////////////////////////
// Name: minifram.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "minifram.h"
#endif
#include "wx/minifram.h"
#include "wx/dcscreen.h"
//-----------------------------------------------------------------------------
// "clicked"
//-----------------------------------------------------------------------------
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
{
mf->Close();
}
//-----------------------------------------------------------------------------
// wxMiniFrame
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxMiniFrame,wxFrame)
EVT_PAINT(wxMiniFrame::OnPaint)
EVT_MOUSE_EVENTS(wxMiniFrame::OnMouse)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
style = style | wxSIMPLE_BORDER;
m_miniEdge = 3;
m_miniTitle = 13;
m_isDragging = FALSE;
m_oldX = -1;
m_oldY = -1;
m_diffX = 0;
m_diffY = 0;
wxFrame::Create( parent, id, title, pos, size, style, name );
GtkWidget *close_button = gtk_button_new_with_label( "x" );
gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), close_button, 4, 4 );
gtk_widget_set_usize( close_button, 12, 11 );
gtk_widget_show( close_button );
gtk_signal_connect( GTK_OBJECT(close_button), "clicked",
GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
return TRUE;
}
void wxMiniFrame::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
if (m_miniTitle == 0) return;
if (m_title.IsEmpty()) return;
wxPaintDC dc(this);
dc.SetBrush( *wxTRANSPARENT_BRUSH );
dc.DrawRectangle( 0, 0, m_width, m_height );
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( 1, 1, m_width-2, 1 );
dc.DrawLine( 1, 1, 1, m_height-2 );
dc.SetPen( *wxMEDIUM_GREY_PEN );
dc.DrawLine( 1, m_height-1, m_width-2, m_height-1 );
dc.DrawLine( m_width-1, 1, m_width-1, m_height-2 );
dc.SetBrush( *wxBLUE_BRUSH );
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( m_miniEdge, m_miniEdge, m_width - 2*m_miniEdge, m_miniTitle );
dc.SetTextForeground( *wxWHITE );
dc.SetFont( *wxSMALL_FONT );
dc.DrawText( m_title, 14 + m_miniEdge, 1 + m_miniEdge );
}
void wxMiniFrame::DrawFrame( int x, int y )
{
int org_x = 0;
int org_y = 0;
gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y );
x += org_x;
y += org_y;
wxScreenDC dc;
dc.SetLogicalFunction( wxXOR );
dc.DrawRectangle( x, y, m_width, m_height );
}
void wxMiniFrame::OnMouse( wxMouseEvent &event )
{
int x = event.GetX();
int y = event.GetY();
if (event.LeftDown())
{
CaptureMouse();
m_diffX = x;
m_diffY = y;
DrawFrame( 0, 0 );
m_oldX = 0;
m_oldY = 0;
m_isDragging = TRUE;
return;
}
if (event.Dragging() && m_isDragging)
{
DrawFrame( m_oldX, m_oldY );
m_oldX = x - m_diffX;
m_oldY = y - m_diffY;
DrawFrame( m_oldX, m_oldY );
return;
}
if (event.LeftUp() && m_isDragging)
{
m_isDragging = FALSE;
DrawFrame( m_oldX, m_oldY );
ReleaseMouse();
int org_x = 0;
int org_y = 0;
gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y );
x += org_x - m_diffX;
y += org_y - m_diffY;
m_x = x;
m_y = y;
gtk_widget_set_uposition( m_widget, x, y );
return;
}
event.Skip();
}

74
src/gtk1/frame.cpp
View File

@@ -108,6 +108,8 @@ wxFrame::wxFrame()
m_frameStatusBar = (wxStatusBar *) NULL;
m_frameToolBar = (wxToolBar *) NULL;
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
}
wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
@@ -118,6 +120,8 @@ wxFrame::wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
m_frameStatusBar = (wxStatusBar *) NULL;
m_frameToolBar = (wxToolBar *) NULL;
m_sizeSet = FALSE;
m_miniEdge = 0;
m_miniTitle = 0;
Create( parent, id, title, pos, size, style, name );
}
@@ -213,7 +217,7 @@ bool wxFrame::Destroy()
wxPoint wxFrame::GetClientAreaOrigin() const
{
wxPoint pt(0, 0);
wxPoint pt( m_miniEdge, m_miniEdge + m_miniTitle );
if (m_frameMenuBar)
{
int h = 0;
@@ -325,6 +329,11 @@ void wxFrame::GetClientSize( int *width, int *height ) const
m_frameToolBar->GetSize( (int *) NULL, &y );
(*height) -= y;
}
(*height) -= m_miniEdge*2 + m_miniTitle;
}
if (width)
{
(*width) -= m_miniEdge*2;
}
}
@@ -341,7 +350,7 @@ void wxFrame::SetClientSize( int const width, int const height )
m_frameToolBar->GetSize( (int *) NULL, &y );
h += y;
}
wxWindow::SetClientSize( width, h );
wxWindow::SetClientSize( width + m_miniEdge*2, h + m_miniEdge*2 + m_miniTitle );
}
void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height )
@@ -365,39 +374,57 @@ void wxFrame::GtkOnSize( int WXUNUSED(x), int WXUNUSED(y), int width, int height
gtk_widget_set_usize( m_widget, m_width, m_height );
// This emulates the new wxMSW behaviour
// this emulates the new wxMSW behaviour of placing all
// frame-subwindows (menu, toolbar..) on one native window
// OK, 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)
{
m_frameMenuBar->m_x = 1;
m_frameMenuBar->m_y = 1;
m_frameMenuBar->m_width = m_width-2;
m_frameMenuBar->m_height = wxMENU_HEIGHT-2;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameMenuBar->m_widget, 1, 1 );
gtk_widget_set_usize( m_frameMenuBar->m_widget, m_width-2, wxMENU_HEIGHT-2 );
int xx = 1 + m_miniEdge;
int yy = 1 + m_miniEdge + m_miniTitle;
int ww = m_width - 2 - 2*m_miniEdge;
int hh = wxMENU_HEIGHT-2;
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 );
}
if (m_frameToolBar)
{
int y = 0;
if (m_frameMenuBar) y = wxMENU_HEIGHT;
int h = m_frameToolBar->m_height;
int xx = 1 + m_miniEdge;
int yy = m_miniEdge + m_miniTitle;
if (m_frameMenuBar) yy += wxMENU_HEIGHT;
int ww = m_width -2 - 2*m_miniEdge;
int hh = m_frameToolBar->m_height;
m_frameToolBar->m_x = 2;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, 2, y );
gtk_widget_set_usize( m_frameToolBar->m_widget, m_width-3, h );
m_frameToolBar->m_x = xx;
m_frameToolBar->m_y = yy;
m_frameToolBar->m_height = hh;
m_frameToolBar->m_width = ww;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameToolBar->m_widget, xx, yy );
gtk_widget_set_usize( m_frameToolBar->m_widget, ww, hh );
}
if (m_frameStatusBar)
{
// OK, 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.
m_frameStatusBar->m_x = 0;
m_frameStatusBar->m_y = m_height-wxSTATUS_HEIGHT;
m_frameStatusBar->m_width = m_width;
m_frameStatusBar->m_height = wxSTATUS_HEIGHT;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, 0, m_height-wxSTATUS_HEIGHT );
gtk_widget_set_usize( m_frameStatusBar->m_widget, m_width, wxSTATUS_HEIGHT );
int xx = 0 + m_miniEdge;
int yy = m_height - wxSTATUS_HEIGHT - m_miniEdge;
int ww = m_width - 2*m_miniEdge;
int hh = wxSTATUS_HEIGHT;
m_frameStatusBar->m_x = xx;
m_frameStatusBar->m_y = yy;
m_frameStatusBar->m_width = ww;
m_frameStatusBar->m_height = hh;
gtk_myfixed_move( GTK_MYFIXED(m_wxwindow), m_frameStatusBar->m_widget, xx, yy );
gtk_widget_set_usize( m_frameStatusBar->m_widget, ww, hh );
}
m_sizeSet = TRUE;
@@ -606,3 +633,4 @@ void wxFrame::SetIcon( const wxIcon &icon )
gdk_window_set_icon( m_widget->window, (GdkWindow *) NULL, icon.GetPixmap(), bm );
}

153
src/gtk1/minifram.cpp Normal file
View File

@@ -0,0 +1,153 @@
/////////////////////////////////////////////////////////////////////////////
// Name: minifram.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Copyright: (c) 1998 Robert Roebling
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
#pragma implementation "minifram.h"
#endif
#include "wx/minifram.h"
#include "wx/dcscreen.h"
//-----------------------------------------------------------------------------
// "clicked"
//-----------------------------------------------------------------------------
static void gtk_button_clicked_callback( GtkWidget *WXUNUSED(widget), wxMiniFrame *mf )
{
mf->Close();
}
//-----------------------------------------------------------------------------
// wxMiniFrame
//-----------------------------------------------------------------------------
BEGIN_EVENT_TABLE(wxMiniFrame,wxFrame)
EVT_PAINT(wxMiniFrame::OnPaint)
EVT_MOUSE_EVENTS(wxMiniFrame::OnMouse)
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxMiniFrame,wxFrame)
bool wxMiniFrame::Create( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos, const wxSize &size,
long style, const wxString &name )
{
style = style | wxSIMPLE_BORDER;
m_miniEdge = 3;
m_miniTitle = 13;
m_isDragging = FALSE;
m_oldX = -1;
m_oldY = -1;
m_diffX = 0;
m_diffY = 0;
wxFrame::Create( parent, id, title, pos, size, style, name );
GtkWidget *close_button = gtk_button_new_with_label( "x" );
gtk_myfixed_put( GTK_MYFIXED(m_wxwindow), close_button, 4, 4 );
gtk_widget_set_usize( close_button, 12, 11 );
gtk_widget_show( close_button );
gtk_signal_connect( GTK_OBJECT(close_button), "clicked",
GTK_SIGNAL_FUNC(gtk_button_clicked_callback), (gpointer*)this );
return TRUE;
}
void wxMiniFrame::OnPaint( wxPaintEvent &WXUNUSED(event) )
{
if (m_miniTitle == 0) return;
if (m_title.IsEmpty()) return;
wxPaintDC dc(this);
dc.SetBrush( *wxTRANSPARENT_BRUSH );
dc.DrawRectangle( 0, 0, m_width, m_height );
dc.SetPen( *wxWHITE_PEN );
dc.DrawLine( 1, 1, m_width-2, 1 );
dc.DrawLine( 1, 1, 1, m_height-2 );
dc.SetPen( *wxMEDIUM_GREY_PEN );
dc.DrawLine( 1, m_height-1, m_width-2, m_height-1 );
dc.DrawLine( m_width-1, 1, m_width-1, m_height-2 );
dc.SetBrush( *wxBLUE_BRUSH );
dc.SetPen( *wxTRANSPARENT_PEN );
dc.DrawRectangle( m_miniEdge, m_miniEdge, m_width - 2*m_miniEdge, m_miniTitle );
dc.SetTextForeground( *wxWHITE );
dc.SetFont( *wxSMALL_FONT );
dc.DrawText( m_title, 14 + m_miniEdge, 1 + m_miniEdge );
}
void wxMiniFrame::DrawFrame( int x, int y )
{
int org_x = 0;
int org_y = 0;
gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y );
x += org_x;
y += org_y;
wxScreenDC dc;
dc.SetLogicalFunction( wxXOR );
dc.DrawRectangle( x, y, m_width, m_height );
}
void wxMiniFrame::OnMouse( wxMouseEvent &event )
{
int x = event.GetX();
int y = event.GetY();
if (event.LeftDown())
{
CaptureMouse();
m_diffX = x;
m_diffY = y;
DrawFrame( 0, 0 );
m_oldX = 0;
m_oldY = 0;
m_isDragging = TRUE;
return;
}
if (event.Dragging() && m_isDragging)
{
DrawFrame( m_oldX, m_oldY );
m_oldX = x - m_diffX;
m_oldY = y - m_diffY;
DrawFrame( m_oldX, m_oldY );
return;
}
if (event.LeftUp() && m_isDragging)
{
m_isDragging = FALSE;
DrawFrame( m_oldX, m_oldY );
ReleaseMouse();
int org_x = 0;
int org_y = 0;
gdk_window_get_origin( m_wxwindow->window, &org_x, &org_y );
x += org_x - m_diffX;
y += org_y - m_diffY;
m_x = x;
m_y = y;
gtk_widget_set_uposition( m_widget, x, y );
return;
}
event.Skip();
}