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

GTK

Browse Source 
combobox
    idle handling
    makefile fixes


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
1998-06-03 19:06:13 +00:00
parent 884d770ab5
commit 53010e52d3
17 changed files with 864 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/generic/listctrl.h
View File

@@ -602,7 +602,6 @@ class wxListCtrl: public wxControl
void SetSingleStyle( const long style, const bool add = TRUE ) ;
void SetWindowStyleFlag(const long style);
void RecreateWindow(void) {};
void RealizeChanges( void ); // whereas this is much needed in wxGLC
long GetNextItem(const long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE);
wxImageList *GetImageList(const int which);
void SetImageList(wxImageList *imageList, const int which) ;
@@ -631,6 +630,8 @@ class wxListCtrl: public wxControl
{ m_mainWin->SetDropTarget( dropTarget ); };
wxDropTarget *GetDropTarget() const
{ return m_mainWin->GetDropTarget(); };
void OnIdle( wxIdleEvent &event );
protected:

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

@@ -61,10 +61,10 @@ class wxApp: public wxEvtHandler
static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }
virtual bool OnInit(void);
virtual bool OnInitGui(void);
virtual int OnRun(void);
virtual bool OnIdle(void);
virtual int OnExit(void);
wxWindow *GetTopWindow(void);
@@ -74,8 +74,14 @@ class wxApp: public wxEvtHandler
bool Initialized(void);
virtual bool Pending(void);
virtual void Dispatch(void);
void DeletePendingObjects(void);
inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
void OnIdle( wxIdleEvent &event );
bool SendIdleEvents(void);
bool SendIdleEvents( wxWindow* win );
inline wxString GetAppName(void) const {
if (m_appName != "")
return m_appName;
@@ -90,9 +96,6 @@ class wxApp: public wxEvtHandler
void SetPrintMode(int WXUNUSED(mode) ) {};
int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };
static void CommonInit(void);
static void CommonCleanUp(void);
// override this function to create default log target of arbitrary
// user-defined classv (default implementation creates a wxLogGui object)
@@ -104,17 +107,29 @@ class wxApp: public wxEvtHandler
virtual wxConfig *CreateConfig() { return NULL; }
#endif
// GTK implementation
static void CommonInit(void);
static void CommonCleanUp(void);
bool ProcessIdle(void);
void DeletePendingObjects(void);
bool m_initialized;
bool m_exitOnFrameDelete;
gint m_idleTag;
bool m_wantDebugOutput;
wxWindow *m_topWindow;
wxString m_appName;
wxString m_className;
gint m_idleTag;
int argc;
char **argv;
static wxAppInitializerFunction m_appInitFn;
DECLARE_EVENT_TABLE()
};
#endif // __GTKAPPH__

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

@@ -75,7 +75,7 @@ class wxComboBox: public wxControl
wxString GetString( const int n ) const;
wxString GetStringSelection(void) const;
int Number(void) const;
void SetSelection( const int n, const bool select = TRUE );
void SetSelection( const int n );
// Text field functions
wxString GetValue(void) const ;

29
include/wx/gtk1/app.h
View File

@@ -61,10 +61,10 @@ class wxApp: public wxEvtHandler
static void SetInitializerFunction(wxAppInitializerFunction fn) { m_appInitFn = fn; }
static wxAppInitializerFunction GetInitializerFunction(void) { return m_appInitFn; }
virtual bool OnInit(void);
virtual bool OnInitGui(void);
virtual int OnRun(void);
virtual bool OnIdle(void);
virtual int OnExit(void);
wxWindow *GetTopWindow(void);
@@ -74,8 +74,14 @@ class wxApp: public wxEvtHandler
bool Initialized(void);
virtual bool Pending(void);
virtual void Dispatch(void);
void DeletePendingObjects(void);
inline void SetWantDebugOutput(bool flag) { m_wantDebugOutput = flag; }
inline bool GetWantDebugOutput(void) { return m_wantDebugOutput; }
void OnIdle( wxIdleEvent &event );
bool SendIdleEvents(void);
bool SendIdleEvents( wxWindow* win );
inline wxString GetAppName(void) const {
if (m_appName != "")
return m_appName;
@@ -90,9 +96,6 @@ class wxApp: public wxEvtHandler
void SetPrintMode(int WXUNUSED(mode) ) {};
int GetPrintMode(void) const { return wxPRINT_POSTSCRIPT; };
static void CommonInit(void);
static void CommonCleanUp(void);
// override this function to create default log target of arbitrary
// user-defined classv (default implementation creates a wxLogGui object)
@@ -104,17 +107,29 @@ class wxApp: public wxEvtHandler
virtual wxConfig *CreateConfig() { return NULL; }
#endif
// GTK implementation
static void CommonInit(void);
static void CommonCleanUp(void);
bool ProcessIdle(void);
void DeletePendingObjects(void);
bool m_initialized;
bool m_exitOnFrameDelete;
gint m_idleTag;
bool m_wantDebugOutput;
wxWindow *m_topWindow;
wxString m_appName;
wxString m_className;
gint m_idleTag;
int argc;
char **argv;
static wxAppInitializerFunction m_appInitFn;
DECLARE_EVENT_TABLE()
};
#endif // __GTKAPPH__

2
include/wx/gtk1/combobox.h
View File

@@ -75,7 +75,7 @@ class wxComboBox: public wxControl
wxString GetString( const int n ) const;
wxString GetStringSelection(void) const;
int Number(void) const;
void SetSelection( const int n, const bool select = TRUE );
void SetSelection( const int n );
// Text field functions
wxString GetValue(void) const ;