virtual void MakeModal(bool modal = TRUE);
virtual void Restore();
+ virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+ virtual bool IsFullScreen() const { return m_fsIsShowing; };
+
virtual void SetMenuBar( wxMenuBar *menuBar );
#if wxUSE_STATUSBAR
bool m_toolBarDetached;
bool m_insertInClientArea; /* not from within OnCreateXXX */
+ bool m_fsIsShowing; /* full screen */
+ long m_fsSaveStyle;
+ long m_fsSaveFlag;
+ wxRect m_fsSaveFrame;
+
protected:
// common part of all ctors
void Init();
virtual void MakeModal(bool modal = TRUE);
virtual void Restore();
+ virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
+ virtual bool IsFullScreen() const { return m_fsIsShowing; };
+
virtual void SetMenuBar( wxMenuBar *menuBar );
#if wxUSE_STATUSBAR
bool m_toolBarDetached;
bool m_insertInClientArea; /* not from within OnCreateXXX */
+ bool m_fsIsShowing; /* full screen */
+ long m_fsSaveStyle;
+ long m_fsSaveFlag;
+ wxRect m_fsSaveFrame;
+
protected:
// common part of all ctors
void Init();
void OnAbout( wxCommandEvent &event );
void OnQuit( wxCommandEvent &event );
+ void OnFullScreen( wxCommandEvent &event );
wxScrolledWindow *m_scrolled;
wxTextCtrl *m_log;
// MyFrame
const int ID_QUIT = 108;
-const int ID_ABOUT = 109;
+const int ID_FULL = 109;
+const int ID_ABOUT = 110;
IMPLEMENT_DYNAMIC_CLASS( MyFrame, wxFrame )
BEGIN_EVENT_TABLE(MyFrame,wxFrame)
EVT_MENU (ID_ABOUT, MyFrame::OnAbout)
EVT_MENU (ID_QUIT, MyFrame::OnQuit)
+ EVT_MENU (ID_FULL, MyFrame::OnFullScreen)
END_EVENT_TABLE()
MyFrame::MyFrame()
wxPoint(20,20), wxSize(470,500) )
{
wxMenu *file_menu = new wxMenu();
- file_menu->Append( ID_ABOUT, "&About..");
+ file_menu->Append( ID_ABOUT, "&About...");
+ file_menu->Append( ID_FULL, "&Full screen on/off");
file_menu->Append( ID_QUIT, "E&xit\tAlt-X");
wxMenuBar *menu_bar = new wxMenuBar();
Close( TRUE );
}
+void MyFrame::OnFullScreen( wxCommandEvent &WXUNUSED(event) )
+{
+ ShowFullScreen( !IsFullScreen(), wxFULLSCREEN_NOBORDER|wxFULLSCREEN_NOCAPTION );
+}
+
void MyFrame::OnAbout( wxCommandEvent &WXUNUSED(event) )
{
(void)wxMessageBox( "wxScroll demo II\n"
}
if (m_pen.GetStyle() != wxTRANSPARENT)
+ {
gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+
+ gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
+ gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+ }
}
CalcBoundingBox (x1, y1);
if (m_window)
{
wxCoord start = wxCoord(sa * 64.0);
- wxCoord end = wxCoord(ea * 64.0);
+ wxCoord end = wxCoord((ea-sa) * 64.0);
if (m_brush.GetStyle() != wxTRANSPARENT)
{
wxTopLevelWindows.Append( this );
m_needParent = FALSE;
+ m_fsIsShowing = FALSE;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
}
}
+bool wxFrame::ShowFullScreen(bool show, long style )
+{
+ if (show == m_fsIsShowing) return FALSE; // return what?
+
+ m_fsIsShowing = show;
+
+ if (show)
+ {
+ m_fsSaveStyle = m_windowStyle;
+ m_fsSaveFlag = style;
+ GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
+ GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
+
+ gtk_widget_hide( m_widget );
+ gtk_widget_unrealize( m_widget );
+
+ m_windowStyle = wxSIMPLE_BORDER;
+
+ int x;
+ int y;
+ wxDisplaySize( &x, &y );
+ SetSize( 0, 0, x, y );
+
+ gtk_widget_realize( m_widget );
+ gtk_widget_show( m_widget );
+ }
+ else
+ {
+ gtk_widget_hide( m_widget );
+ gtk_widget_unrealize( m_widget );
+
+ m_windowStyle = m_fsSaveStyle;
+
+ SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );
+
+ gtk_widget_realize( m_widget );
+ gtk_widget_show( m_widget );
+ }
+
+ return TRUE;
+}
+
// ----------------------------------------------------------------------------
// overridden wxWindow methods
// ----------------------------------------------------------------------------
#include <gdk/gdk.h>
#include <gtk/gtk.h>
+#define OLDCODE 0
//-----------------------------------------------------------------------------
// wxRegion
~wxRegionRefData();
GdkRegion *m_region;
+#if OLDCODE
wxList m_rects;
+#endif
};
wxRegionRefData::wxRegionRefData()
{
if (m_region) gdk_region_destroy( m_region );
+#if OLDCODE
wxNode *node = m_rects.First();
while (node)
{
delete r;
node = node->Next();
}
+#endif
}
//-----------------------------------------------------------------------------
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg );
#endif
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
+#endif
}
wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg );
#endif
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
+#endif
}
wxRegion::wxRegion( const wxRect& rect )
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
gdk_region_destroy( reg );
#endif
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
+#endif
}
wxRegion::wxRegion()
#endif
}
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
+#endif
return TRUE;
}
M_REGIONDATA->m_region = reg;
#endif
+#if OLDCODE
wxNode *node = region.GetRectList()->First();
while (node)
{
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
node = node->Next();
}
+#endif
return TRUE;
}
M_REGIONDATA->m_region = reg;
#endif
+#if OLDCODE
wxNode *node = region.GetRectList()->First();
while (node)
{
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
node = node->Next();
}
+#endif
return TRUE;
}
wxList *wxRegion::GetRectList() const
{
+#if OLDCODE
if (!m_refData)
return (wxList*) NULL;
return &(M_REGIONDATA->m_rects);
+#else
+ return (wxList*) NULL;
+#endif
}
//-----------------------------------------------------------------------------
-// wxRegion
+// wxRegionIterator
//-----------------------------------------------------------------------------
+#if OLDCODE
+
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
wxRegionIterator::wxRegionIterator()
wxRegionIterator::operator bool () const
{
- return m_current < (size_t)m_region.GetRectList()->Number();
+ return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects() const
{
- return m_current < (size_t)m_region.GetRectList()->Number();
+ return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ ()
{
- if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
+ if (HaveRects()) ++m_current;
}
void wxRegionIterator::operator ++ (int)
{
- if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
+ if (HaveRects()) ++m_current;
}
wxCoord wxRegionIterator::GetX() const
return r->height;
}
+#else
+
+// the following structures must match the private structures
+// in X11 region code ( xc/lib/X11/region.h )
+
+// this makes the Region type transparent
+// and we have access to the region rectangles
+
+struct _XBox {
+ short x1, x2, y1, y2;
+};
+
+struct _XRegion {
+ long size , numRects;
+ _XBox *rects, extents;
+};
+
+class wxRIRefData: public wxObjectRefData
+{
+public:
+
+ wxRIRefData() : m_rects(0), m_numRects(0){}
+ ~wxRIRefData();
+
+ wxRect *m_rects;
+ size_t m_numRects;
+
+ void CreateRects( const wxRegion& r );
+};
+
+wxRIRefData::~wxRIRefData()
+{
+ delete m_rects;
+}
+
+#include <gdk/gdkprivate.h>
+
+void wxRIRefData::CreateRects( const wxRegion& region )
+{
+ if( m_rects )
+ delete m_rects;
+ m_rects = 0;
+ m_numRects= 0;
+ GdkRegion *gdkregion= region.GetRegion();
+ if( gdkregion ){
+ Region r= ((GdkRegionPrivate *)gdkregion)->xregion;
+ if( r ){
+ m_numRects= r->numRects;
+ if( m_numRects )
+ {
+ m_rects= new wxRect[m_numRects];
+ for( size_t i=0; i<m_numRects; ++i )
+ {
+ _XBox &xr= r->rects[i];
+ wxRect&wr= m_rects[i];
+ wr.x = xr.x1;
+ wr.y = xr.y1;
+ wr.width = xr.x2-xr.x1;
+ wr.height= xr.y2-xr.y1;
+ }
+ }
+ }
+ }
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+
+wxRegionIterator::wxRegionIterator()
+{
+ m_refData = new wxRIRefData();
+ Reset();
+}
+
+wxRegionIterator::wxRegionIterator( const wxRegion& region )
+{
+ m_refData = new wxRIRefData();
+ Reset(region);
+}
+
+void wxRegionIterator::Reset( const wxRegion& region )
+{
+ m_region = region;
+ ((wxRIRefData*)m_refData)->CreateRects(region);
+ Reset();
+}
+
+bool wxRegionIterator::HaveRects() const
+{
+ return m_current < ((wxRIRefData*)m_refData)->m_numRects;
+}
+
+wxRegionIterator::operator bool () const
+{
+ return HaveRects();
+}
+
+void wxRegionIterator::operator ++ ()
+{
+ if (HaveRects()) ++m_current;
+}
+
+void wxRegionIterator::operator ++ (int)
+{
+ if (HaveRects()) ++m_current;
+}
+
+wxCoord wxRegionIterator::GetX() const
+{
+ if( !HaveRects() ) return 0;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
+}
+
+wxCoord wxRegionIterator::GetY() const
+{
+ if( !HaveRects() ) return 0;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
+}
+
+wxCoord wxRegionIterator::GetW() const
+{
+ if( !HaveRects() ) return -1;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
+}
+
+wxCoord wxRegionIterator::GetH() const
+{
+ if( !HaveRects() ) return -1;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
+}
+
+#endif
}
if (m_pen.GetStyle() != wxTRANSPARENT)
+ {
gdk_draw_arc( m_window, m_penGC, FALSE, xxc-r, yyc-r, 2*r,2*r, alpha1, alpha2 );
+
+ gdk_draw_line( m_window, m_penGC, xx1, yy1, xxc, yyc );
+ gdk_draw_line( m_window, m_penGC, xxc, yyc, xx2, yy2 );
+ }
}
CalcBoundingBox (x1, y1);
if (m_window)
{
wxCoord start = wxCoord(sa * 64.0);
- wxCoord end = wxCoord(ea * 64.0);
+ wxCoord end = wxCoord((ea-sa) * 64.0);
if (m_brush.GetStyle() != wxTRANSPARENT)
{
wxTopLevelWindows.Append( this );
m_needParent = FALSE;
+ m_fsIsShowing = FALSE;
if (!PreCreation( parent, pos, size ) ||
!CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
}
}
+bool wxFrame::ShowFullScreen(bool show, long style )
+{
+ if (show == m_fsIsShowing) return FALSE; // return what?
+
+ m_fsIsShowing = show;
+
+ if (show)
+ {
+ m_fsSaveStyle = m_windowStyle;
+ m_fsSaveFlag = style;
+ GetPosition( &m_fsSaveFrame.x, &m_fsSaveFrame.y );
+ GetSize( &m_fsSaveFrame.width, &m_fsSaveFrame.height );
+
+ gtk_widget_hide( m_widget );
+ gtk_widget_unrealize( m_widget );
+
+ m_windowStyle = wxSIMPLE_BORDER;
+
+ int x;
+ int y;
+ wxDisplaySize( &x, &y );
+ SetSize( 0, 0, x, y );
+
+ gtk_widget_realize( m_widget );
+ gtk_widget_show( m_widget );
+ }
+ else
+ {
+ gtk_widget_hide( m_widget );
+ gtk_widget_unrealize( m_widget );
+
+ m_windowStyle = m_fsSaveStyle;
+
+ SetSize( m_fsSaveFrame.x, m_fsSaveFrame.y, m_fsSaveFrame.width, m_fsSaveFrame.height );
+
+ gtk_widget_realize( m_widget );
+ gtk_widget_show( m_widget );
+ }
+
+ return TRUE;
+}
+
// ----------------------------------------------------------------------------
// overridden wxWindow methods
// ----------------------------------------------------------------------------
#include <gdk/gdk.h>
#include <gtk/gtk.h>
+#define OLDCODE 0
//-----------------------------------------------------------------------------
// wxRegion
~wxRegionRefData();
GdkRegion *m_region;
+#if OLDCODE
wxList m_rects;
+#endif
};
wxRegionRefData::wxRegionRefData()
{
if (m_region) gdk_region_destroy( m_region );
+#if OLDCODE
wxNode *node = m_rects.First();
while (node)
{
delete r;
node = node->Next();
}
+#endif
}
//-----------------------------------------------------------------------------
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg );
#endif
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,w,h) );
+#endif
}
wxRegion::wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &rect );
gdk_region_destroy( reg );
#endif
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(topLeft,bottomRight) );
+#endif
}
wxRegion::wxRegion( const wxRect& rect )
M_REGIONDATA->m_region = gdk_region_union_with_rect( reg, &g_rect );
gdk_region_destroy( reg );
#endif
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(rect.x,rect.y,rect.width,rect.height) );
+#endif
}
wxRegion::wxRegion()
#endif
}
+#if OLDCODE
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(x,y,width,height) );
+#endif
return TRUE;
}
M_REGIONDATA->m_region = reg;
#endif
+#if OLDCODE
wxNode *node = region.GetRectList()->First();
while (node)
{
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
node = node->Next();
}
+#endif
return TRUE;
}
M_REGIONDATA->m_region = reg;
#endif
+#if OLDCODE
wxNode *node = region.GetRectList()->First();
while (node)
{
M_REGIONDATA->m_rects.Append( (wxObject*) new wxRect(r->x,r->y,r->width,r->height) );
node = node->Next();
}
+#endif
return TRUE;
}
wxList *wxRegion::GetRectList() const
{
+#if OLDCODE
if (!m_refData)
return (wxList*) NULL;
return &(M_REGIONDATA->m_rects);
+#else
+ return (wxList*) NULL;
+#endif
}
//-----------------------------------------------------------------------------
-// wxRegion
+// wxRegionIterator
//-----------------------------------------------------------------------------
+#if OLDCODE
+
IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
wxRegionIterator::wxRegionIterator()
wxRegionIterator::operator bool () const
{
- return m_current < (size_t)m_region.GetRectList()->Number();
+ return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
bool wxRegionIterator::HaveRects() const
{
- return m_current < (size_t)m_region.GetRectList()->Number();
+ return m_region.GetRectList() && m_current < (size_t)m_region.GetRectList()->Number();
}
void wxRegionIterator::operator ++ ()
{
- if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
+ if (HaveRects()) ++m_current;
}
void wxRegionIterator::operator ++ (int)
{
- if (m_current < (size_t)m_region.GetRectList()->Number()) ++m_current;
+ if (HaveRects()) ++m_current;
}
wxCoord wxRegionIterator::GetX() const
return r->height;
}
+#else
+
+// the following structures must match the private structures
+// in X11 region code ( xc/lib/X11/region.h )
+
+// this makes the Region type transparent
+// and we have access to the region rectangles
+
+struct _XBox {
+ short x1, x2, y1, y2;
+};
+
+struct _XRegion {
+ long size , numRects;
+ _XBox *rects, extents;
+};
+
+class wxRIRefData: public wxObjectRefData
+{
+public:
+
+ wxRIRefData() : m_rects(0), m_numRects(0){}
+ ~wxRIRefData();
+
+ wxRect *m_rects;
+ size_t m_numRects;
+
+ void CreateRects( const wxRegion& r );
+};
+
+wxRIRefData::~wxRIRefData()
+{
+ delete m_rects;
+}
+
+#include <gdk/gdkprivate.h>
+
+void wxRIRefData::CreateRects( const wxRegion& region )
+{
+ if( m_rects )
+ delete m_rects;
+ m_rects = 0;
+ m_numRects= 0;
+ GdkRegion *gdkregion= region.GetRegion();
+ if( gdkregion ){
+ Region r= ((GdkRegionPrivate *)gdkregion)->xregion;
+ if( r ){
+ m_numRects= r->numRects;
+ if( m_numRects )
+ {
+ m_rects= new wxRect[m_numRects];
+ for( size_t i=0; i<m_numRects; ++i )
+ {
+ _XBox &xr= r->rects[i];
+ wxRect&wr= m_rects[i];
+ wr.x = xr.x1;
+ wr.y = xr.y1;
+ wr.width = xr.x2-xr.x1;
+ wr.height= xr.y2-xr.y1;
+ }
+ }
+ }
+ }
+}
+
+IMPLEMENT_DYNAMIC_CLASS(wxRegionIterator,wxObject);
+
+wxRegionIterator::wxRegionIterator()
+{
+ m_refData = new wxRIRefData();
+ Reset();
+}
+
+wxRegionIterator::wxRegionIterator( const wxRegion& region )
+{
+ m_refData = new wxRIRefData();
+ Reset(region);
+}
+
+void wxRegionIterator::Reset( const wxRegion& region )
+{
+ m_region = region;
+ ((wxRIRefData*)m_refData)->CreateRects(region);
+ Reset();
+}
+
+bool wxRegionIterator::HaveRects() const
+{
+ return m_current < ((wxRIRefData*)m_refData)->m_numRects;
+}
+
+wxRegionIterator::operator bool () const
+{
+ return HaveRects();
+}
+
+void wxRegionIterator::operator ++ ()
+{
+ if (HaveRects()) ++m_current;
+}
+
+void wxRegionIterator::operator ++ (int)
+{
+ if (HaveRects()) ++m_current;
+}
+
+wxCoord wxRegionIterator::GetX() const
+{
+ if( !HaveRects() ) return 0;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].x;
+}
+
+wxCoord wxRegionIterator::GetY() const
+{
+ if( !HaveRects() ) return 0;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].y;
+}
+
+wxCoord wxRegionIterator::GetW() const
+{
+ if( !HaveRects() ) return -1;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].width;
+}
+
+wxCoord wxRegionIterator::GetH() const
+{
+ if( !HaveRects() ) return -1;
+ return ((wxRIRefData*)m_refData)->m_rects[m_current].height;
+}
+
+#endif