wxruby3 0.9.1 → 0.9.2

data/lib/wx/rtc/rich_text_paragraph.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module RTC
+
+    class RichTextParagraph
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/stc/require.rb

@@ -6,5 +6,6 @@
 
 require_relative './events/evt_list'
 require_relative './keyword_defs'
+require_relative './styled_text_ctrl'
 
 Wx::Dialog.setup_dialog_functors(Wx::STC)

data/lib/wx/stc/styled_text_ctrl.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+module Wx
+
+  module STC
+
+    class StyledTextCtrl
+
+      # Overload to provide Enumerator without block
+      wx_each_line = instance_method :each_line
+      define_method :each_line do |&block|
+        if block
+          wx_each_line.bind(self).call(&block)
+        else
+          ::Enumerator.new { |y| wx_each_line.bind(self).call { |ln| y << ln } }
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/wx/version.rb

@@ -3,5 +3,5 @@
 # This software is released under the MIT license.
 
 module Wx
-  WXRUBY_VERSION    = '0.9.1'
+  WXRUBY_VERSION    = '0.9.2'
 end

data/rakelib/lib/config/linux.rb

@@ -65,9 +65,6 @@ module WXRuby3
           # create a .so binary
           @extra_ldflags << '-shared'
 
-          # This class is not available on linux ports (wxGTK/wxQT/wxX11/wxMotif)
-          exclude_module('wxPrinterDC')
-
           unless @wx_path.empty?
             libdirs = @wx_libs.select {|s| s.start_with?('-L')}.collect {|s| s.sub(/^-L/,'')}
             @exec_env['LD_LIBRARY_PATH'] = "#{ENV['LD_LIBRARY_PATH']}:#{dest_dir}:#{libdirs.join(':')}"

data/rakelib/lib/config/macosx.rb

@@ -65,7 +65,7 @@ module WXRuby3
               end
             end
             # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-            if features_set?('wxUSE_MEDIACTRL')
+            if features_set?('USE_MEDIACTRL')
               lib_list = wx_config("--libs media").split(' ')
               until lib_list.empty?
                 s = lib_list.shift
@@ -107,7 +107,7 @@ module WXRuby3
           @ld.sub!(/-o\s*\Z/, '')
 
           @extra_cflags.concat %w[-Wno-unused-function -Wno-conversion-null -Wno-sometimes-uninitialized
-                                  -Wno-overloaded-virtual -Wno-deprecated-copy -Wno-format-security]
+                                  -Wno-overloaded-virtual -Wno-deprecated-copy]
           @extra_cflags << ' -Wno-deprecated-declarations' unless @no_deprecated
 
           # create a .dylib binary

data/rakelib/lib/config/mingw.rb

@@ -35,7 +35,7 @@ module WXRuby3
           end
 
           def debug_command(*args)
-            args.unshift(FileUtils::RUBY)
+            args.unshift(nix_path(FileUtils::RUBY))
             args.unshift('--args')
             args.unshift('gdb')
             args.join(' ')

data/rakelib/lib/config/unixish.rb

@@ -136,7 +136,7 @@ module WXRuby3
         wx_libset = ::Set.new
         wx_libset.merge wx_config("--libs all").split(' ')
         # some weird thing with this; at least sometimes '--libs all' will not output media library even if feature active
-        if features_set?('wxUSE_MEDIACTRL')
+        if features_set?('USE_MEDIACTRL')
           wx_libset.merge wx_config("--libs media").split(' ')
         end
         wx_libset.collect { |s| s.dup }

data/rakelib/lib/config.rb

@@ -589,7 +589,7 @@ module WXRuby3
           private :any_feature_set?
 
           def features_set?(*featureset)
-            featureset.all? do |feature|
+            featureset.flatten.all? do |feature|
               if AnyOf === feature
                 any_feature_set?(*feature.features)
               else
@@ -615,9 +615,19 @@ module WXRuby3
           def _retrieve_features(wxwidgets_setup_h)
             features = {}
 
-            File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01])/) do | define |
-              features[$1] = $2.to_i.zero? ? false : true
-            end if is_configured? && wxwidgets_setup_h
+            if is_configured? && wxwidgets_setup_h
+              File.read(wxwidgets_setup_h).scan(/^\s*#define\s+(wx\w+|__\w+__)\s+([01])/) do | define |
+                feat_val = $2.to_i.zero? ? false : true
+                feat_id = $1.sub(/\Awx/i, '').gsub(/\A__|__\Z/, '')
+                features[feat_id] = feat_val
+              end
+              # make sure correct platform defines are included as well which will not be the case always
+              # (for example __WXMSW__ and __WXOSX__ are not in setup.h)
+              features['WXMSW'] = true if features['GNUWIN32']
+              features['WXOSX'] = true if features['DARWIN']
+              # prior to wxWidgets 3.3 this feature was not set for wxGTK builds
+              features['WXGTK'] = true if features['LINUX'] && !features['WXGTK'] && wx_port == :wxgtk
+            end
 
             features
           end

data/rakelib/lib/core/package.rb

@@ -105,7 +105,7 @@ module WXRuby3
       end
 
       def included_directors
-        directors.select { |dir| !Config.instance.excluded_module?(dir.spec) }
+        directors.select { |dir| Package.full_docs? || !Config.instance.excluded_module?(dir.spec) }
       end
 
       def director_for_class(class_name)
@@ -248,7 +248,7 @@ module WXRuby3
         end
 
         # next initialize all modules with classes depending (bases AND mixins) on classes in any modules already
-        # selected until there are no more modules left or none that are left depend on any selected ones
+        # selecteduntil there are no more modules left or none that are left depend on any selected ones
         while dir_inx = inc_dirs.find_index { |dir| !dir.spec.initialize_at_end && is_dir_with_fulfilled_deps?(dir, cls_set) }
           dir = inc_dirs[dir_inx]
           modreg = Spec.module_registry[dir.spec.module_name]
@@ -359,8 +359,7 @@ module WXRuby3
               # generate constant definitions for feature defines from setup.h
               fsrc.puts %Q{VALUE mWxSetup = rb_define_module_under(#{module_variable}, "Setup");}
               Config.instance.features.each do |feature, val|
-                const_name = rb_wx_name(feature).gsub(/\A__|__\Z/, '')
-                fsrc.puts %Q{rb_define_const(mWxSetup, "#{const_name}", Q#{val});}
+                fsrc.puts %Q{rb_define_const(mWxSetup, "#{feature}", Q#{val});}
               end
             else
               fsrc.puts %Q{#{module_variable} = rb_define_module_under(wxRuby_Core(), "#{name}");}
@@ -523,10 +522,12 @@ module WXRuby3
             # ----------------------------------------------------------------------------
 
   
-            class Wx::EvtHandler
+            module Wx
 
-          __HEREDOC
-          fdoc.indent do
+              class EvtHandler
+
+            __HEREDOC
+          fdoc.indent(2) do
             fdoc.doc.puts "@!group #{name} Event handler methods"
             fdoc.puts
             evts_handled = ::Set.new
@@ -557,6 +558,8 @@ module WXRuby3
             fdoc.doc.puts '@!endgroup'
           end
           fdoc.puts
+          fdoc.puts '  end'
+          fdoc.puts
           fdoc.puts 'end'
         end
       end
@@ -634,6 +637,10 @@ module WXRuby3
       end
       private :generate_core_doc
 
+      def self.full_docs?
+        !!ENV['WXRUBY_FULLDOCS']
+      end
+
       def generate_docs
         # make sure all modules have been extracted from xml
         included_directors.each {|dir| dir.extract_interface(false, gendoc: true) }

data/rakelib/lib/core/spec.rb

@@ -327,7 +327,12 @@ module WXRuby3
       end
 
       def ignore(*names, ignore_doc: true)
-        names.flatten.each {|n| @ignores[n] = ignore_doc}
+        names.flatten.each { |n| @ignores[n] = {ignore: true, ignore_doc: ignore_doc} }
+        self
+      end
+
+      def ignore_unless(feature_set, *names)
+        names.flatten.each { |n| @ignores[n] = {ignore: feature_set} }
         self
       end
 

data/rakelib/lib/director/accelerator.rb

@@ -47,9 +47,8 @@ module WXRuby3
                    (TYPE($input) == T_STRING && RSTRING_LEN($input) == 1) );
             __CODE
         end
-        unless Config.instance.features_set?('__WXMSW__')
-          spec.ignore('wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
-        end
+        spec.ignore_unless('WXMSW',
+                           'wxAcceleratorTable::wxAcceleratorTable(const wxString &)')
         spec.add_swig_code <<~__HEREDOC
           %warnfilter(509) wxAcceleratorTable::wxAcceleratorTable;
           __HEREDOC

data/rakelib/lib/director/accessible.rb

@@ -0,0 +1,47 @@
+# Copyright (c) 2023 M.J.N. Corino, The Netherlands
+#
+# This software is released under the MIT license.
+
+###
+# wxRuby3 wxWidgets interface director
+###
+
+module WXRuby3
+
+  class Director
+
+    class Accessible < Director
+
+      def setup
+        super
+        spec.make_abstract 'wxAccessible'
+        spec.map 'wxAccessible**' => 'Wx::Accessible' do
+          map_in ignore: true, temp: 'wxAccessible* tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            if (tmp$argnum)
+            {
+              $result = SWIG_Ruby_AppendOutput($result, SWIG_NewPointerObj(SWIG_as_voidptr(tmp$argnum), SWIGTYPE_p_wxAccessible,  0));
+            }
+            __HEREDOC
+
+        end
+        spec.map 'wxString *' => 'String' do
+          map_in ignore: true, temp: 'wxString tmp', code: '$1 = &tmp;'
+          map_argout code: '$result = SWIG_Ruby_AppendOutput($result, WXSTR_TO_RSTR(tmp$argnum));'
+        end
+        spec.map 'wxAccRole *' => 'Wx::AccRole' do
+          map_in ignore: true, temp: 'wxAccRole tmp', code: '$1 = &tmp;'
+          map_argout code: <<~__HEREDOC
+            $result = SWIG_Ruby_AppendOutput($result, wxRuby_GetEnumValueObject("AccRole", static_cast<int>(tmp$argnum)));
+            __HEREDOC
+        end
+        spec.map_apply 'int * OUTPUT' => ['int * childCount', 'int * childId', 'int * toId']
+        spec.map_apply 'long * OUTPUT' => 'long * state'
+      end
+
+    end
+
+  end
+
+end
+

data/rakelib/lib/director/app.rb

@@ -16,6 +16,15 @@ module WXRuby3
 
       def setup
         spec.items << 'wxAppConsole' << 'wxEventFilter'
+        if Config.instance.wx_version >= '3.3.0'
+          spec.items << 'wxDarkModeSettings'
+          spec.ignore_unless('WXMSW', 'wxDarkModeSettings', 'wxMenuColour')
+          if Config.instance.features_set?('WXMSW')
+            spec.disown 'wxDarkModeSettings *settings'
+            # wxDarkModeSettings does has have virt dtor; it's just not documented
+            spec.suppress_warning(514, 'wxDarkModeSettings')
+          end
+        end
         spec.fold_bases('wxApp' => 'wxAppConsole', 'wxAppConsole' => 'wxEventFilter')
         spec.override_inheritance_chain('wxApp', %w[wxEvtHandler wxObject])
         spec.ignore %w{
@@ -134,339 +143,23 @@ module WXRuby3
           extern "C" void Init_wxRubyStockObjects();
           extern void wxRuby_MarkProtectedEvtHandlerProcs();
 
-          #ifdef __WXMSW__
-          extern "C"
-          {
-            WXDLLIMPEXP_BASE HINSTANCE wxGetInstance();
-          }
-          #endif
-
           static wxVector<WXRBMarkFunction> WXRuby_Mark_List;
 
           WXRUBY_EXPORT void wxRuby_AppendMarker(WXRBMarkFunction marker)
           {
             WXRuby_Mark_List.push_back(marker);
           }
-          
-          class wxRubyApp : public wxApp
-          {
-          private:
-            static wxRubyApp* instance_;
 
-            bool is_running_ = false;
-          public:
-            static wxRubyApp* GetInstance () { return instance_; }
-
-            virtual ~wxRubyApp()
-            {
-          #ifdef __WXTRACE__
-            std::wcout << "~wxRubyApp" << std::endl;
-          #endif
-              // unlink
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              if (the_app != Qnil) 
-              {
-                DATA_PTR(the_app) = 0;
-              }
-            }
-          
-            // special event handler for destruction of windows which is done
-            // automatically by wxWidgets. Tag the object as having been destroyed
-            // by WxWidgets.
-            void OnWindowDestroy(wxWindowDestroyEvent &event)
-            {
-              wxObject* wx_obj = event.GetEventObject();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "<= OnWindowDestroy [" << wx_obj << "]" << std::endl;
-          #endif
-              GC_SetWindowDeleted((void *)wx_obj);
-              event.Skip();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=> OnWindowDestroy [" << wx_obj << "]" << std::endl;
-          #endif
-            }
-
-            bool IsRunning() const { return this->is_running_; }
-          
-            // When ruby's garbage collection runs, if the app is still active, it
-            // cycles through all currently known SWIG objects and calls this
-            // function on each to preserve still active Wx::Windows, and also
-            // pending Wx::Events which have been queued from the Ruby side (the
-            // only sort of events that will be in the tracking hash.
-            static void markIterate(void* ptr, VALUE rb_obj)
-            {
-              // Check if it's a valid object (sometimes SWIG doesn't return what we're
-              // expecting), a descendant of Wx::Window (but not a Dialog), and if it has not yet been
-              // deleted by WxWidgets; if so, mark it.
-              if ( TYPE(rb_obj) == T_DATA )
-              {
-                if ( rb_obj_is_kind_of(rb_obj, wxRuby_GetWindowClass()) )
-                {
-                  rb_gc_mark(rb_obj);
-                }
-                else if (rb_obj_is_kind_of(rb_obj, wxRuby_GetDefaultEventClass()) )
-                  rb_gc_mark(rb_obj);
-              }
-              else if (TYPE(rb_obj) == T_ARRAY )
-              {
-                VALUE proc = rb_ary_entry(rb_obj, 0);
-                if (rb_obj_is_kind_of(proc, rb_cProc) || rb_obj_is_kind_of(proc, rb_cMethod))
-                {
-                  // keep the async call alive
-                  rb_gc_mark(rb_obj);
-                }
-              }
-            }
-          
-            // Implements GC protection across wxRuby. Always called because
-            // Wx::THE_APP is a constant so always checked in GC mark phase.
-            static void mark_wxRubyApp(void *ptr)
-            {
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=== Starting App GC mark phase" << std::endl;
-          #endif
-          
-              // If the App has ended, the ruby object will have been unlinked from
-              // the C++ one; this implies that all Windows have already been destroyed
-              // so there is no point trying to mark them, and doing so may cause
-              // errors.
-              if ( !wxRubyApp::GetInstance() || !wxRubyApp::GetInstance()->IsRunning() )
-              {
-          #ifdef __WXRB_DEBUG__
-                if (wxRuby_TraceLevel()>0)
-                  std::wcout << "=== App has ended, skipping mark phase" << std::endl;
-          #endif
-                return;
-              }
-          
-              // Mark any active (tracked) log target
-              wxLog* curLog = wxLog::GetActiveTarget();
-              VALUE rb_cur_log = wxRuby_FindTracking(curLog);
-              if (!NIL_P(rb_cur_log))
-              {
-                rb_gc_mark(rb_cur_log);
-              }
-
-              // Mark evt handler procs associated with live windows - see
-              // classes/EvtHandler.i
-              wxRuby_MarkProtectedEvtHandlerProcs();
-
-              // run registered markers
-              for (wxVector<WXRBMarkFunction>::iterator it = WXRuby_Mark_List.begin();
-                    it != WXRuby_Mark_List.end() ;++it)
-              {
-                (*it) ();
-              }
-          
-              // To do the main marking, primarily of Windows, iterate over SWIG's
-              // list of tracked objects
-              wxRuby_IterateTracking(&wxRubyApp::markIterate);
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "=== App GC mark phase completed" << std::endl;
-          #endif
-            }
-          
-            // This is the method run when main_loop is called in Ruby
-            // wxEntry calls the C++ App::OnInit method
-            int main_loop()
-            {
-              VALUE rb_app = SWIG_RubyInstanceFor(this);
-              rb_define_const(#{spec.package.module_variable}, "THE_APP", rb_app);
-              this->Connect(wxEVT_DESTROY,
-                    wxWindowDestroyEventHandler(wxRubyApp::OnWindowDestroy));
-          
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "Calling wxEntry, this=" << this << std::endl;
-          #endif
-          
-          #ifdef __WXMSW__
-              extern int wxEntry(HINSTANCE hInstance,
-                         HINSTANCE WXUNUSED(hPrevInstance),
-                         wxCmdLineArgType WXUNUSED(pCmdLine),
-                         int nCmdShow);
-              wxEntry(wxGetInstance(),
-                      (HINSTANCE)0,
-                      (wxCmdLineArgType)"",
-                      (int)true);
-          #else
-              int argc = 1;
-              const char* argv[2] = { "ruby", 0 };
-              wxEntry(argc, const_cast<char**>(&argv[0]));
-          #endif
-          
-              rb_const_remove(#{spec.package.module_variable}, rb_intern("THE_APP"));
-
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "returned from wxEntry..." << std::endl;
-          #endif
-              rb_gc_start();
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "survived gc" << std::endl;
-          #endif
-
-              VALUE exc = rb_iv_get(rb_app, "@exception");
-              if (!NIL_P(exc))
-              {
-                rb_exc_raise(exc);
-              }
-              return 0;
-            }
-          
-            // This method initializes the stock objects (Pens, Brushes, Fonts)
-            // before yielding to ruby by calling the App's on_init method.
-            // Note that as of wxWidget 2.8, the stock fonts in particular cannot
-            // be initialized any earlier than this without crashing
-            bool OnInit() override
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "OnInit..." << std::endl;
-          #endif
-              // set standard App name
-              this->SetAppName(wxString("wxruby"));
-              // Signal that we've started              
-              wxRubyApp::instance_ = this; // there should ALWAYS EVER be only 1 app instance running/created
-              this->is_running_ = true;
-              // Set up the GDI objects
-              Init_wxRubyStockObjects();
-              // Get the ruby representation of the App object, and call the
-              // ruby on_init method to set up the initial window state
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              bool ex_caught = false;
-              VALUE result  = wxRuby_Funcall(ex_caught, the_app, rb_intern("on_ruby_init"), 0, 0);
-
-              if (ex_caught)
-              {
-          #ifdef __WXRB_DEBUG__
-                wxRuby_PrintException(result);
-          #endif
-                rb_iv_set(the_app, "@exception", result);
-                result = Qfalse; // exit app
-              }
-        
-              // If on_init return any (ruby) true value, signal to wxWidgets to
-              // enter the main event loop by returning true, else return false
-              // which will make wxWidgets exit.
-              if ( result == Qfalse || result == Qnil )
-              {
-                wxRubyApp::instance_ = 0;
-                this->is_running_ = false;
-                return false;
-              }
-              else
-              {
-                return true;
-              }
-            }
-          
-            int OnExit() override
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "OnExit..." << std::endl;
-          #endif
-
-              // Get the ruby representation of the App object, and call the
-              // ruby on_exit method (if any) for application level cleanup
-              VALUE the_app = rb_const_get(#{spec.package.module_variable}, rb_intern("THE_APP"));
-              ID on_exit_id = rb_intern("on_exit");
-              if (rb_funcall(the_app, rb_intern("respond_to?"), 1, ID2SYM(on_exit_id)) == Qtrue)
-              {
-                bool ex_caught = false;
-                VALUE rc = wxRuby_Funcall(ex_caught, the_app, on_exit_id, 0, 0);
-                if (ex_caught)
-                {
-          #ifdef __WXRB_DEBUG__
-                  wxRuby_PrintException(rc);
-          #endif
-                  rb_iv_set(the_app, "@exception", rc);
-                }
-              }
-
-              // perform wxRuby cleanup
-              _wxRuby_Cleanup();
-      
-              // execute base wxWidgets functionality 
-              return this->wxApp::OnExit();
-            }
-          
-            // actually implemented in ruby in classes/app.rb
-            virtual void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg) override
-            {
-              VALUE rb_app = SWIG_RubyInstanceFor(this);
-              if (rb_during_gc() || NIL_P(rb_app))
-              {
-                std::wcout << file << "(" << line << "): ASSERT " << cond 
-                           << (NIL_P(rb_app) ? " fired without THE_APP in " : " fired during GC phase in ") 
-                           << func << "() with message [" << msg << "]" << std::endl;
-              }
-              else
-              {
-                VALUE obj0 = Qnil ;
-                VALUE obj1 = Qnil ;
-                VALUE obj2 = Qnil ;
-                VALUE obj3 = Qnil ;
-                VALUE obj4 = Qnil ;
-                
-                obj0 = rb_str_new2((const char *)wxString(file).utf8_str());
-                obj1 = INT2NUM(line);
-                obj2 = rb_str_new2((const char *)wxString(func).utf8_str());
-                obj3 = rb_str_new2((const char *)wxString(cond).utf8_str());
-                obj4 = rb_str_new2((const char *)wxString(msg).utf8_str());
-                (void)wxRuby_Funcall(rb_app, rb_intern("on_assert_failure"), 5,obj0,obj1,obj2,obj3,obj4);
-              }
-            }
-
-            void _wxRuby_Cleanup()
-            {
-          #ifdef __WXRB_DEBUG__
-              if (wxRuby_TraceLevel()>0)
-                std::wcout << "wxRuby_Cleanup..." << std::endl;
-          #endif
-              // Note in a global variable that the App has ended, so that we
-              // can skip any GC marking later
-              wxRubyApp::instance_ = 0;
-              this->is_running_ = false;
-      
-              // if a Ruby implemented logger has been installed clean that up
-              // before we exit, otherwise let wxWidgets handle things
-              wxLog *oldlog = wxLog::GetActiveTarget();
-              if (wxRuby_FindTracking(oldlog) != Qnil)
-              {
-                oldlog = wxLog::SetActiveTarget(new wxLogStderr);
-              }
-              else
-              {
-                oldlog = 0;
-              }
-              SetTopWindow(0);
-              if ( oldlog )
-              {
-                SWIG_RubyUnlinkObjects(oldlog);
-                SWIG_RubyRemoveTracking(oldlog);
-                delete oldlog;
-              }
-            }
-          };
-          wxRubyApp* wxRubyApp::instance_ = 0;
+          #include "wxRubyApp.h"          
 
           WXRUBY_EXPORT bool wxRuby_IsAppRunning()
           {
-            return wxRubyApp::GetInstance() != 0 && wxRubyApp::GetInstance()->IsRunning();  
+            return wxRubyApp::GetInstance() && wxRubyApp::GetInstance()->IsRunning();  
           }
 
           WXRUBY_EXPORT void wxRuby_ExitMainLoop(VALUE exception)
           {
-            if (wxRubyApp::GetInstance() != 0 && wxRubyApp::GetInstance()->IsRunning())
+            if (wxRubyApp::GetInstance() && wxRubyApp::GetInstance()->IsRunning())
             {
               if (!NIL_P(exception))
               {