Here it comes:
Doc updates Makefile doesn't strip anylonger Makefile adapted to /src/unix etc Added wxLB_ALWAYS_SB Added MWM window manager hints Fixed event handling bugs that (among others) caused the wxListBox misbeahiour Rwwrote GtkmyFixed for GTK 1.2 Made data requests etc in wxClipboadr asynchronous Added underscores to menus (some) Tried in vain to make wxTextCtrl (and its GtkTable) behave correctly. The bottom text control in the controls samples still misbehaves upon start-up. did I change notebook.cpp ? git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -79,7 +79,9 @@ public:
|
||||
bool m_ownsPrimarySelection;
|
||||
|
||||
wxDataBroker *m_dataBroker;
|
||||
GtkWidget *m_clipboardWidget;
|
||||
GtkWidget *m_clipboardWidget; /* for getting and offering data */
|
||||
GtkWidget *m_targetsWidget; /* for getting list of supported formats */
|
||||
bool m_waiting; /* querying data or formats is asynchronous */
|
||||
|
||||
bool m_formatSupported;
|
||||
GdkAtom m_targetRequested;
|
||||
|
@@ -105,9 +105,9 @@ class wxMenu : public wxEvtHandler
|
||||
DECLARE_DYNAMIC_CLASS(wxMenu)
|
||||
|
||||
public:
|
||||
// construction
|
||||
wxMenu( const wxString& title = wxEmptyString,
|
||||
const wxFunction func = (wxFunction) NULL );
|
||||
~wxMenu();
|
||||
|
||||
// operations
|
||||
// title
|
||||
@@ -171,8 +171,11 @@ public:
|
||||
wxWindow *GetInvokingWindow();
|
||||
|
||||
// implementation only
|
||||
GtkWidget *m_menu; // GtkMenu
|
||||
GtkWidget *m_owner;
|
||||
GtkWidget *m_menu; // GtkMenu
|
||||
GtkWidget *m_owner;
|
||||
|
||||
GtkAccelGroup *m_accel;
|
||||
GtkItemFactory *m_factory;
|
||||
|
||||
private:
|
||||
wxString m_title;
|
||||
|
@@ -11,10 +11,10 @@
|
||||
#ifndef __GTK_MYFIXED_H__
|
||||
#define __GTK_MYFIXED_H__
|
||||
|
||||
|
||||
#include <gdk/gdk.h>
|
||||
#include <gtk/gtkcontainer.h>
|
||||
|
||||
#include <gtk/gtkadjustment.h>
|
||||
#include <gtk/gtkfeatures.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@@ -33,13 +33,21 @@ typedef struct _GtkMyFixedChild GtkMyFixedChild;
|
||||
struct _GtkMyFixed
|
||||
{
|
||||
GtkContainer container;
|
||||
|
||||
GList *children;
|
||||
#if (GTK_MINOR_VERSION > 0)
|
||||
GtkShadowType shadow_type;
|
||||
#endif
|
||||
};
|
||||
|
||||
struct _GtkMyFixedClass
|
||||
{
|
||||
GtkContainerClass parent_class;
|
||||
|
||||
#if (GTK_MINOR_VERSION > 0)
|
||||
void (*set_scroll_adjustments) (GtkMyFixed *myfixed,
|
||||
GtkAdjustment *hadjustment,
|
||||
GtkAdjustment *vadjustment);
|
||||
#endif
|
||||
};
|
||||
|
||||
struct _GtkMyFixedChild
|
||||
@@ -51,6 +59,10 @@ struct _GtkMyFixedChild
|
||||
|
||||
guint gtk_myfixed_get_type (void);
|
||||
GtkWidget* gtk_myfixed_new (void);
|
||||
#if (GTK_MINOR_VERSION > 0)
|
||||
void gtk_myfixed_set_shadow_type (GtkMyFixed *myfixed,
|
||||
GtkShadowType type);
|
||||
#endif
|
||||
void gtk_myfixed_put (GtkMyFixed *myfixed,
|
||||
GtkWidget *widget,
|
||||
gint16 x,
|
||||
@@ -59,7 +71,6 @@ void gtk_myfixed_move (GtkMyFixed *myfixed,
|
||||
GtkWidget *widget,
|
||||
gint16 x,
|
||||
gint16 y);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
@@ -98,16 +98,6 @@ private:
|
||||
wxString m_data;
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// (debug)
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
#ifdef __WXDEBUG__
|
||||
|
||||
void debug_focus_in( GtkWidget* widget, const char* name, const char* window );
|
||||
|
||||
#endif
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// wxWindow
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -485,7 +475,7 @@ public:
|
||||
GtkAdjustment *m_hAdjust,*m_vAdjust;
|
||||
float m_oldHorizontalPos;
|
||||
float m_oldVerticalPos;
|
||||
bool m_needParent;
|
||||
bool m_needParent; /* ! wxFrame, wxDialog, wxNotebookPage ? */
|
||||
bool m_hasScrolling;
|
||||
bool m_isScrolling;
|
||||
bool m_hasVMT;
|
||||
@@ -493,8 +483,9 @@ public:
|
||||
bool m_resizing;
|
||||
GdkGC *m_scrollGC;
|
||||
GtkStyle *m_widgetStyle;
|
||||
bool m_isStaticBox;
|
||||
bool m_acceptsFocus;
|
||||
bool m_isStaticBox; /* faster than IS_KIND_OF */
|
||||
bool m_isFrame; /* faster than IS_KIND_OF */
|
||||
bool m_acceptsFocus; /* ! wxStaticBox etc. */
|
||||
|
||||
wxInsertChildFunction m_insertCallback;
|
||||
|
||||
|
Reference in New Issue
Block a user