don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/univ/dialog.h b/include/wx/univ/dialog.h
index 0892d2f95007adcaea4a1bd0aa997029c7d285c6..0f9d7f67585a1e75e27fd69e9db28b6dd70411c8 100644 (file)
--- a/include/wx/univ/dialog.h
+++ b/include/wx/univ/dialog.h
@@ -11,16 +11,12 @@
 #ifndef _WX_UNIV_DIALOG_H_
 #define _WX_UNIV_DIALOG_H_
 
 #ifndef _WX_UNIV_DIALOG_H_
 #define _WX_UNIV_DIALOG_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univdialog.h"
-#endif
-
-WXDLLEXPORT_DATA(extern const wxChar*) wxDialogNameStr;
-class WXDLLEXPORT wxWindowDisabler;
-class WXDLLEXPORT wxEventLoop;
+extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
+class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
+class WXDLLIMPEXP_FWD_CORE wxEventLoop;

 
 // Dialog boxes
 
 // Dialog boxes

-class WXDLLEXPORT wxDialog : public wxDialogBase
+class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase

 {
 public:
     wxDialog() { Init(); }
 {
 public:
     wxDialog() { Init(); }


@@ -58,7 +54,7 @@ public:
     // returns true if we're in a modal loop
     bool IsModalShowing() const;
 
     // returns true if we're in a modal loop
     bool IsModalShowing() const;
 

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

 
     // implementation only from now on
     // -------------------------------
 
     // implementation only from now on
     // -------------------------------