Correct check for MSVC version in wxUSE_GRAPHICS_CONTEXT definition.

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

diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index d3e9e4392d8c8f13bd9848e9b4692c2b8e27e312..71c80a0fc461ec19de94df714c6f7a5927c375fc 100644 (file)
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -55,9 +55,9 @@ enum wxDialogLayoutAdaptationMode
 
 enum wxDialogModality
 {
 
 enum wxDialogModality
 {

-    wxDIALOG_MODALITY_NONE = 0,             
-    wxDIALOG_MODALITY_WINDOW_MODAL = 1,      
-    wxDIALOG_MODALITY_APP_MODAL = 2         
+    wxDIALOG_MODALITY_NONE = 0,
+    wxDIALOG_MODALITY_WINDOW_MODAL = 1,
+    wxDIALOG_MODALITY_APP_MODAL = 2

 };
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
 };
 
 extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];


@@ -74,7 +74,7 @@ public:
     virtual bool IsModal() const = 0;
     // show the dialog frame-modally (needs a parent), using app-modal
     // dialogs on platforms that don't support it
     virtual bool IsModal() const = 0;
     // show the dialog frame-modally (needs a parent), using app-modal
     // dialogs on platforms that don't support it

-    virtual bool ShowWindowModal () ;
+    virtual void ShowWindowModal () ;

     virtual void SendWindowModalDialogEvent ( wxEventType type );
 
     // Modal dialogs have a return code - usually the id of the last
     virtual void SendWindowModalDialogEvent ( wxEventType type );
 
     // Modal dialogs have a return code - usually the id of the last


@@ -164,7 +164,7 @@ public:
     static void EnableLayoutAdaptation(bool enable) { sm_layoutAdaptation = enable; }
 
     // modality kind
     static void EnableLayoutAdaptation(bool enable) { sm_layoutAdaptation = enable; }
 
     // modality kind

-    wxDialogModality GetModality() const;
+    virtual wxDialogModality GetModality() const;

 protected:
     // emulate click of a button with the given id if it's present in the dialog
     //
 protected:
     // emulate click of a button with the given id if it's present in the dialog
     //


@@ -342,8 +342,8 @@ public:
 
     wxDialog *GetDialog() const
         { return wxStaticCast(GetEventObject(), wxDialog); }
 
     wxDialog *GetDialog() const
         { return wxStaticCast(GetEventObject(), wxDialog); }

-        
-    int GetReturnCode() const 
+
+    int GetReturnCode() const

         { return GetDialog()->GetReturnCode(); }
 
     virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }
         { return GetDialog()->GetReturnCode(); }
 
     virtual wxEvent *Clone() const { return new wxWindowModalDialogEvent (*this); }