Added USE_CONFIG
A little more DnD work wxDialog now inherits from wxPanel (recompile) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -17,10 +17,7 @@
|
||||
#endif
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/object.h"
|
||||
#include "wx/string.h"
|
||||
#include "wx/event.h"
|
||||
#include "wx/window.h"
|
||||
#include "wx/panel.h"
|
||||
#include "wx/icon.h"
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -45,7 +42,7 @@ extern const char *wxDialogNameStr;
|
||||
// wxDialog
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
class wxDialog: public wxWindow
|
||||
class wxDialog: public wxPanel
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxDialog)
|
||||
|
||||
|
@@ -82,7 +82,9 @@ class wxListBox: public wxControl
|
||||
void SetSelection( int n, bool select = TRUE );
|
||||
void SetString( int n, const wxString &string );
|
||||
void SetStringSelection( const wxString &string, bool select = TRUE );
|
||||
|
||||
void SetFont( const wxFont &font );
|
||||
void SetDropTarget( wxDropTarget *dropTarget );
|
||||
|
||||
// implementation
|
||||
|
||||
|
@@ -61,6 +61,8 @@ extern const wxPoint wxDefaultPosition;
|
||||
|
||||
class wxWindow: public wxEvtHandler
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS(wxWindow)
|
||||
|
||||
public:
|
||||
wxWindow();
|
||||
inline wxWindow(wxWindow *parent, wxWindowID id,
|
||||
@@ -228,15 +230,17 @@ public:
|
||||
virtual bool AcceptsFocus() const;
|
||||
void UpdateWindowUI();
|
||||
|
||||
public: // cannot get private going yet
|
||||
|
||||
// implementation
|
||||
|
||||
virtual GtkWidget* GetConnectWidget(void);
|
||||
virtual bool IsOwnGtkWindow( GdkWindow *window );
|
||||
void ConnectWidget( GtkWidget *widget );
|
||||
void ConnectDnDWidget( GtkWidget *widget );
|
||||
void DisconnectDnDWidget( GtkWidget *widget );
|
||||
|
||||
void PreCreation( wxWindow *parent, wxWindowID id, const wxPoint &pos,
|
||||
const wxSize &size, long style, const wxString &name );
|
||||
void PostCreation();
|
||||
void ConnectWidget( GtkWidget *widget );
|
||||
bool HasVMT();
|
||||
virtual void ImplementSetSize();
|
||||
virtual void ImplementSetPosition();
|
||||
@@ -313,7 +317,6 @@ public:
|
||||
virtual void GetClientSizeConstraint(int *w, int *h) const ;
|
||||
virtual void GetPositionConstraint(int *x, int *y) const ;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxWindow)
|
||||
DECLARE_EVENT_TABLE()
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user