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

A bit more Unicode compilation.

Browse Source 
Window insertion corrections for window, frame, dialog, mdi.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2597 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-05-30 16:20:42 +00:00
parent f3bd1796ca
commit ddb6bc7126
14 changed files with 132 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/gtk/frame.h
View File

@@ -49,7 +49,7 @@ class wxFrame: public wxWindow
DECLARE_DYNAMIC_CLASS(wxFrame)
public:
wxFrame();
wxFrame() { Init(); }
wxFrame( wxWindow *parent, wxWindowID id, const wxString &title,
const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize,
long style = wxDEFAULT_FRAME_STYLE, const wxString &name = wxFrameNameStr );
@@ -120,6 +120,9 @@ public:
bool m_insertInClientArea; /* not from within OnCreateXXX */
protected:
// common part of all ctors
void Init();
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);

2
include/wx/gtk/mdi.h
View File

@@ -123,7 +123,7 @@ class wxMDIChildFrame: public wxFrame
virtual wxStatusBar* CreateStatusBar( int WXUNUSED(number)=1, long WXUNUSED(style)=1,
wxWindowID WXUNUSED(id)=1, const wxString& WXUNUSED(name)=WXSTRINGCAST NULL ) {return (wxStatusBar*)NULL; }
virtual wxStatusBar *GetStatusBar() const { return (wxStatusBar*)NULL; }
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number) ) {}
virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {}
virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {}
// no size hints

18
include/wx/gtk/window.h
View File

@@ -125,8 +125,10 @@ public:
const wxSize &size, long style, const wxString &name );
void PostCreation();
void InsertChild(wxWindow *child) { (*m_insertCallback)(this, child); }
void DoAddChild(wxWindow *child) { AddChild(child); InsertChild(child); }
/* internal addition of child windows. differs from class
to class not by using virtual functions but by using
the m_insertCallback */
void DoAddChild(wxWindow *child);
/* the methods below are required because many native widgets
are composed of several subwidgets and setting a style for
@@ -139,14 +141,14 @@ public:
virtual bool IsOwnGtkWindow( GdkWindow *window );
void ConnectWidget( GtkWidget *widget );
// creates a new widget style if none is there
// and sets m_widgetStyle to this value.
/* creates a new widget style if none is there
and sets m_widgetStyle to this value. */
GtkStyle *GetWidgetStyle();
// called by SetFont() and SetXXXColour etc
/* called by SetFont() and SetXXXColour etc */
void SetWidgetStyle();
// overridden in many GTK widgets
/* overridden in many GTK widgets */
virtual void ApplyWidgetStyle();
#if wxUSE_TOOLTIPS
@@ -162,11 +164,11 @@ public:
int m_x, m_y;
int m_width, m_height;
// see the docs in src/gtk/window.cpp
/* see the docs in src/gtk/window.cpp */
GtkWidget *m_widget;
GtkWidget *m_wxwindow;
// scrolling stuff
/* scrolling stuff */
GtkAdjustment *m_hAdjust,*m_vAdjust;
float m_oldHorizontalPos;
float m_oldVerticalPos;