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

Small doc corrections

Browse Source 
Removed wxFontDirectory
  Added move event to dialog and frame
  Cannot remeber the rest


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1999-01-24 15:07:54 +00:00
parent 9838df2cef
commit 36b3b54ad8
29 changed files with 749 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/wx/gtk/app.h
View File

@@ -74,13 +74,14 @@ class wxApp: public wxEvtHandler
wxWindow *GetTopWindow();
void SetTopWindow( wxWindow *win );
virtual int MainLoop();
void ExitMainLoop();
bool Initialized();
virtual bool Pending();
virtual void Dispatch();
inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
inline void SetWantDebugOutput( bool flag ) { m_wantDebugOutput = flag; }
inline bool GetWantDebugOutput() { return m_wantDebugOutput; }
void OnIdle( wxIdleEvent &event );
@@ -88,29 +89,26 @@ class wxApp: public wxEvtHandler
bool SendIdleEvents( wxWindow* win );
inline wxString GetAppName() const
{
if (m_appName != "")
return m_appName;
else return m_className;
}
{ if (m_appName != "") return m_appName; else return m_className; }
inline void SetAppName( const wxString& name ) { m_appName = name; }
inline void SetAppName(const wxString& name) { m_appName = name; };
inline wxString GetClassName() const { return m_className; }
inline void SetClassName(const wxString& name) { m_className = name; }
inline void SetClassName( const wxString& name ) { m_className = name; }
const wxString& GetVendorName() const { return m_vendorName; }
void SetVendorName(const wxString& name) { m_vendorName = name; }
void SetVendorName( const wxString& name ) { m_vendorName = name; }
inline void SetExitOnFrameDelete(bool flag) { m_exitOnFrameDelete = flag; }
inline void SetExitOnFrameDelete( bool flag ) { m_exitOnFrameDelete = flag; }
inline bool GetExitOnFrameDelete() const { return m_exitOnFrameDelete; }
void SetPrintMode(int WXUNUSED(mode) ) {};
int GetPrintMode() const { return wxPRINT_POSTSCRIPT; };
void SetPrintMode( int WXUNUSED(mode) ) {}
int GetPrintMode() const { return wxPRINT_POSTSCRIPT; }
/* override this function to create default log target of arbitrary
* user-defined classv (default implementation creates a wxLogGui object) */
virtual wxLog *CreateLogTarget();
/* GTK implementation */
// implementation
static bool Initialize();
static bool InitialzeVisual();
@@ -130,13 +128,12 @@ class wxApp: public wxEvtHandler
int argc;
char **argv;
wxString m_vendorName;
wxString m_appName;
wxString m_className;
static wxAppInitializerFunction m_appInitFn;
private:
wxString m_vendorName,
m_appName,
m_className;
DECLARE_EVENT_TABLE()
};

7
include/wx/gtk/font.h
View File

@@ -30,13 +30,17 @@ class wxPaintDC;
class wxWindow;
class wxFont;
/*
class wxFontNameDirectory;
*/
//-----------------------------------------------------------------------------
// global variables
//-----------------------------------------------------------------------------
/*
extern wxFontNameDirectory *wxTheFontNameDirectory;
*/
extern const char* wxEmptyString;
//-----------------------------------------------------------------------------
@@ -60,7 +64,6 @@ public:
int GetPointSize() const;
int GetFamily() const;
int GetFontId() const;
int GetStyle() const;
int GetWeight() const;
bool GetUnderlined() const;
@@ -87,6 +90,7 @@ public:
// no data :-)
};
/*
//-----------------------------------------------------------------------------
// wxFontDirectory
//-----------------------------------------------------------------------------
@@ -114,5 +118,6 @@ class wxFontNameDirectory: public wxObject
class wxHashTable *table;
int nextFontId;
};
*/
#endif // __GTKFONTH__

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

@@ -83,7 +83,7 @@ public:
virtual wxToolBar* CreateToolBar( long style = wxNO_BORDER|wxTB_HORIZONTAL, wxWindowID id = -1,
const wxString& name = wxToolBarNameStr);
virtual wxToolBar *OnCreateToolBar( long style, wxWindowID id, const wxString& name );
virtual wxToolBar *GetToolBar(void) const;
virtual wxToolBar *GetToolBar() const;
inline void SetToolBar(wxToolBar *toolbar) { m_frameToolBar = toolbar; }
virtual void SetMenuBar( wxMenuBar *menuBar );
@@ -94,10 +94,10 @@ public:
virtual void SetIcon( const wxIcon &icon );
virtual void Iconize( bool WXUNUSED(iconize)) { }
virtual bool IsIconized(void) const { return FALSE; }
bool Iconized(void) const { return IsIconized(); }
virtual bool IsIconized() const { return FALSE; }
bool Iconized() const { return IsIconized(); }
virtual void Maximize(bool WXUNUSED(maximize)) {}
virtual void Restore(void) {}
virtual void Restore() {}
void OnActivate( wxActivateEvent &WXUNUSED(event) ) { } // called from docview.cpp
void OnSize( wxSizeEvent &event );
@@ -109,7 +109,6 @@ public:
virtual wxPoint GetClientAreaOrigin() const;
void DoMenuUpdates();
void DoMenuUpdates(wxMenu* menu);
virtual void OnInternalIdle();
wxMenuBar *m_frameMenuBar;

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

@@ -41,10 +41,9 @@ class wxGauge: public wxControl
DECLARE_DYNAMIC_CLASS(wxGauge)
public:
inline wxGauge(void) { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; m_useProgressBar = TRUE; }
inline wxGauge( wxWindow *parent, wxWindowID id,
int range,
inline wxGauge( wxWindow *parent, wxWindowID id, int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
@@ -53,8 +52,7 @@ class wxGauge: public wxControl
{
Create(parent, id, range, pos, size, style, validator, name);
}
bool Create( wxWindow *parent, wxWindowID id,
int range,
bool Create( wxWindow *parent, wxWindowID id, int range,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxGA_HORIZONTAL,
@@ -64,13 +62,13 @@ class wxGauge: public wxControl
void SetBezelFace( int WXUNUSED(w) ) {};
void SetRange( int r );
void SetValue( int pos );
int GetShadowWidth(void) const { return 0; };
int GetBezelFace(void) const { return 0; };
int GetRange(void) const;
int GetValue(void) const;
int GetShadowWidth() const { return 0; };
int GetBezelFace() const { return 0; };
int GetRange() const;
int GetValue() const;
// Are we a Win95/GTK progress bar, or a normal gauge?
inline bool GetProgressBar(void) const { return m_useProgressBar; }
inline bool GetProgressBar() const { return m_useProgressBar; }
// implementation

17
include/wx/gtk/gdiobj.h
View File

@@ -17,19 +17,20 @@
#pragma interface
#endif
class WXDLLEXPORT wxGDIObject: public wxObject
class wxGDIObject : public wxObject
{
DECLARE_DYNAMIC_CLASS(wxGDIObject)
public:
inline wxGDIObject(void) { m_visible = FALSE; };
inline ~wxGDIObject(void) {};
virtual bool GetVisible(void) { return m_visible; }
virtual void SetVisible(bool v) { m_visible = v; }
public:
inline wxGDIObject() { m_visible = FALSE; };
inline ~wxGDIObject() {};
virtual bool GetVisible() { return m_visible; }
virtual void SetVisible( bool visible ) { m_visible = visible; }
protected:
bool m_visible; // Can a pointer to this object be safely taken?
// - only if created within FindOrCreate...
bool m_visible; /* can a pointer to this object be safely taken?
* - only if created within FindOrCreate... */
};
#endif

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

@@ -77,8 +77,8 @@ extern const wxPoint wxDefaultPosition;
class wxClientData
{
public:
wxClientData() { }
virtual ~wxClientData() { }
wxClientData() { }
virtual ~wxClientData() { }
};
//-----------------------------------------------------------------------------
@@ -168,13 +168,13 @@ public:
virtual void SetSizeHints( int minW, int minH, int maxW = -1, int maxH = -1, int incW = -1, int incH = -1 );
// Dialog units translations. Implemented in wincmn.cpp.
wxPoint ConvertPixelsToDialog(const wxPoint& pt) ;
wxPoint ConvertDialogToPixels(const wxPoint& pt) ;
inline wxSize ConvertPixelsToDialog(const wxSize& sz)
{ wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
inline wxSize ConvertDialogToPixels(const wxSize& sz)
{ wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
/* Dialog units translations. Implemented in wincmn.cpp. */
wxPoint ConvertPixelsToDialog( const wxPoint& pt );
wxPoint ConvertDialogToPixels( const wxPoint& pt );
inline wxSize ConvertPixelsToDialog( const wxSize& sz )
{ wxPoint pt(ConvertPixelsToDialog(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
inline wxSize ConvertDialogToPixels( const wxSize& sz )
{ wxPoint pt(ConvertDialogToPixels(wxPoint(sz.x, sz.y))); return wxSize(pt.x, pt.y); }
void OnSize( wxSizeEvent &event );
@@ -198,8 +198,8 @@ public:
{ return m_parent; }
wxWindow *GetGrandParent() const
{ return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
void SetParent( wxWindow *p )
{ m_parent = p; }
void SetParent( wxWindow *parent )
{ m_parent = parent; }
virtual wxWindow *ReParent( wxWindow *newParent );
wxEvtHandler *GetEventHandler() const;