Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

[wxWidgets.git] / include / wx / gtk / dialog.h

diff --git a/include/wx/gtk/dialog.h b/include/wx/gtk/dialog.h
index 099dd51d74f371f10cc55f286748fcf17e1fe26d..ef76a636a9db73cd51c544b22672e08b9f504175 100644 (file)
--- a/include/wx/gtk/dialog.h
+++ b/include/wx/gtk/dialog.h
@@ -8,26 +8,10 @@
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKDIALOGH__
-#define __GTKDIALOGH__
+#ifndef _WX_GTKDIALOG_H_
+#define _WX_GTKDIALOG_H_

 
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDialog;
-
-//-----------------------------------------------------------------------------
-// global data
-//-----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_CORE const wxChar *wxDialogNameStr;
+class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop;

 
 //-----------------------------------------------------------------------------
 // wxDialog
 
 //-----------------------------------------------------------------------------
 // wxDialog


@@ -49,18 +33,9 @@ public:
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );
             const wxSize &size = wxDefaultSize,
             long style = wxDEFAULT_DIALOG_STYLE,
             const wxString &name = wxDialogNameStr );

-    ~wxDialog() {}
-
-    void OnApply( wxCommandEvent &event );
-    void OnCancel( wxCommandEvent &event );
-    void OnOK( wxCommandEvent &event );
-    void OnPaint( wxPaintEvent& event );
-    void OnCloseWindow( wxCloseEvent& event );
-    /*
-       void OnCharHook( wxKeyEvent& event );
-     */
+    virtual ~wxDialog();

 
 

-    virtual bool Show( bool show = TRUE );
+    virtual bool Show( bool show = true );

     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;
     virtual int ShowModal();
     virtual void EndModal( int retCode );
     virtual bool IsModal() const;


@@ -71,13 +46,11 @@ public:
 
     bool       m_modalShowing;
 
 
     bool       m_modalShowing;
 

-protected:
+private:

     // common part of all ctors
     void Init();
     // common part of all ctors
     void Init();

-
-private:
-    DECLARE_EVENT_TABLE()
+    wxGUIEventLoop *m_modalLoop;

     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 
     DECLARE_DYNAMIC_CLASS(wxDialog)
 };
 

-#endif // __GTKDIALOGH__
+#endif // _WX_GTKDIALOG_H_