src/windows/native/sun/windows/awt_Dialog.cpp

rev 12527 : 8165543: Better window framing
Reviewed-by: serb

*** 110,125 ****
          }
  
          PDATA pData;
          AwtWindow* awtParent = NULL;
          HWND hwndParent = NULL;
          target = env->GetObjectField(peer, AwtObject::targetID);
          JNI_CHECK_NULL_GOTO(target, "null target", done);
  
          if (parent != NULL) {
              JNI_CHECK_PEER_GOTO(parent, done);
!             awtParent = (AwtWindow *)(JNI_GET_PDATA(parent));
              hwndParent = awtParent->GetHWnd();
          } else {
              // There is no way to prevent a parentless dialog from showing on
              //  the taskbar other than to specify an invisible parent and set
              //  WS_POPUP style for the dialog. Using toolkit window here. That
--- 110,126 ----
          }
  
          PDATA pData;
          AwtWindow* awtParent = NULL;
          HWND hwndParent = NULL;
+ 
          target = env->GetObjectField(peer, AwtObject::targetID);
          JNI_CHECK_NULL_GOTO(target, "null target", done);
  
          if (parent != NULL) {
              JNI_CHECK_PEER_GOTO(parent, done);
!             awtParent = (AwtWindow *)pData;
              hwndParent = awtParent->GetHWnd();
          } else {
              // There is no way to prevent a parentless dialog from showing on
              //  the taskbar other than to specify an invisible parent and set
              //  WS_POPUP style for the dialog. Using toolkit window here. That
*** 782,796 ****
  Java_sun_awt_windows_WDialogPeer_createAwtDialog(JNIEnv *env, jobject self,
                                          jobject parent)
  {
      TRY;
  
-     PDATA pData;
      AwtToolkit::CreateComponent(self, parent,
                                  (AwtToolkit::ComponentFactory)
                                  AwtDialog::Create);
-     JNI_CHECK_PEER_CREATION_RETURN(self);
  
      CATCH_BAD_ALLOC;
  }
  
  /*
--- 783,795 ----