added linear and concentric gradient fill functions (modified/fixed patch from Ryan...

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

diff --git a/include/wx/msw/dialog.h b/include/wx/msw/dialog.h
index 91dd0fc5640433cf2b819478a14e9da791343109..6d26a72c9ff9bcf053a4808199d8470ad78586a9 100644 (file)
--- a/include/wx/msw/dialog.h
+++ b/include/wx/msw/dialog.h
@@ -14,13 +14,13 @@
 
 #include "wx/panel.h"
 
 
 #include "wx/panel.h"
 

-extern WXDLLEXPORT_DATA(const wxChar*) wxDialogNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxDialogNameStr[];

 
 class WXDLLEXPORT wxDialogModalData;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
 class WXDLLEXPORT wxToolBar;
 
 class WXDLLEXPORT wxDialogModalData;
 
 #if wxUSE_TOOLBAR && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
 class WXDLLEXPORT wxToolBar;

-extern WXDLLEXPORT_DATA(const wxChar*) wxToolBarNameStr;
+extern WXDLLEXPORT_DATA(const wxChar) wxToolBarNameStr[];

 #endif
 
 // Dialog boxes
 #endif
 
 // Dialog boxes


@@ -124,6 +124,9 @@ public:
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
 
     // use IsModal()
     wxDEPRECATED( bool IsModalShowing() const );
 

+    // handle Escape here
+    virtual bool MSWProcessMessage(WXMSG* pMsg);
+

 protected:
     // find the window to use as parent for this dialog if none has been
     // specified explicitly by the user
 protected:
     // find the window to use as parent for this dialog if none has been
     // specified explicitly by the user


@@ -142,9 +145,6 @@ protected:
     // return true if button was "clicked" or false if we don't have it
     bool EmulateButtonClickIfPresent(int id);
 
     // return true if button was "clicked" or false if we don't have it
     bool EmulateButtonClickIfPresent(int id);
 

-    // handle Escape here
-    virtual bool MSWProcessMessage(WXMSG* pMsg);
-

 private:
     wxWindow*   m_oldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog
 private:
     wxWindow*   m_oldFocus;
     bool        m_endModalCalled; // allow for closing within InitDialog